CE Upstream - Monday
Resolved conflicts:
UU CHANGELOG.md
UU app/services/projects/destroy_service.rb
UU doc/README.md
UU spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
UU spec/requests/api/users_spec.rb
Resolved conflicts:
UU CHANGELOG.md
UU app/services/projects/destroy_service.rb
UU doc/README.md
UU spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
UU spec/requests/api/users_spec.rb