Merge branch 'fj-clean-content-headers' into 'master'
Add feature flag for workhorse content type calculation See merge request gitlab-org/gitlab-ce!22667
Add feature flag for workhorse content type calculation See merge request gitlab-org/gitlab-ce!22667