CE upstream

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/views/layouts/nav/_group_settings.html.haml
	both modified:   app/views/projects/edit.html.haml
	both modified:   app/views/shared/issuable/_form.html.haml

Related CE changes https://gitlab.com/gitlab-org/gitlab-ce/compare/26bd854aa19e186f529681612164cbf1d5b386fc...fd1741b47970fc52d994367ba38b5d1353d94725