Merge branch 'ce-to-ee-2018-03-16' into 'master'

CE upstream - 2018-03-16 06:40 UTC

See merge request gitlab-org/gitlab-ee!4993

changelogs/unreleased/mk-fix-move-upload-files-on-group-transfer.yml

----
-title: Fix missing uploads after group transfer
-merge_request: 17658
-author:
-type: fixed

doc/development/new_fe_guide/index.md

@@ -19,7 +19,7 @@ Guidance on topics related to development.
 
 Learn about all the dependencies that make up our frontend, including some of our own custom built libraries.
 
-## [Style](style/index.md)
+## [Style guides](style/index.md)
 
 Style guides to keep our code consistent.
 

doc/development/new_fe_guide/style/index.md

-# Style
+# Style guides
 
 ## [HTML style guide](html.md)