Robustify environment policy specs to pass on EE
What does this MR do?
This MR fixes environment policy specs. This change in CE makes this test example pass on EE. Introduced here, to avoid unnecessary conflicts.
What are the relevant issue numbers?
See https://gitlab.slack.com/archives/C0XM5UU6B/p1494325766032915