Cleanup for feature flag defaulting as feature is now working and should
default to active state

Parent issue https://gitlab.com/gitlab-org/gitlab-ee/issues/9928