BigW Consortium Gitlab
Resolve conflicts for Don't reset application settings checkboxes when save another section See merge request gitlab-org/gitlab-ce!18423