Fix for OPA service issue/minor refactoring [GONRG-5212]

Merged Mikhail Piatliou (EPAM) requested to merge gcp-fix-opa-service into master

Merge request reports