Revert "Merge branch 'revert-a87cd883' into 'master'"

This change was original merged: !109008 (merged) and then reverted when this incident occurred: gitlab-com/gl-infra/production#8292 (closed)

The incident was caused by incorrect feature flag logic which was validating un-masked variables as if they were masked. An extra spec to cover this case has now been added.