CE upstream - Wednesday

Files to resolve:

• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/app/assets/javascripts/locale/bg/app.js (UD)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/app/assets/javascripts/locale/de/app.js (UD)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/app/assets/javascripts/locale/en/app.js (UD)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/app/assets/javascripts/locale/fr/app.js (UD)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/app/assets/javascripts/locale/pt_BR/app.js (UD)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/app/assets/javascripts/locale/zh_HK/app.js (UD)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/app/assets/javascripts/locale/zh_TW/app.js (UD)
• @sytses Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/doc/README.md (UU)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/lib/gitlab/ldap/access.rb (UU)
• @reprazent Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/spec/lib/gitlab/ldap/access_spec.rb (UU)
• @dbalexandre Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/b23a7bca7233b7945bc21c7cf39786654735e46b/spec/models/project_spec.rb (UU)

Once the conflicts resolved, please push (no force-push!) to the ce-to-ee-2017-06-28 branch.

Thanks in advance! ❤️

Note: This merge request was created by an experimental script, it's not perfect (yet)!