Merge branch 'gcp-switch-policy-ent2' into 'master'

Update Policy service to work with ent2 [GONRG-2987]

See merge request !42
23 jobs for master in 5 minutes and 4 seconds (queued for 4 seconds)