Ensure feature flags are set properly
What does this MR do?
Closes https://gitlab.com/gitlab-org/quality/nightly/issues/129
CE Port: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32923
Conformity
Edited by Sanad Liaquat
Closes https://gitlab.com/gitlab-org/quality/nightly/issues/129
CE Port: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32923