Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20

# Conflicts:
#	app/views/admin/application_settings/_help_page.html.haml

[ci skip]

app/views/admin/application_settings/_help_page.html.haml

@@ -3,10 +3,13 @@
 
   %fieldset
     .form-group
+<<<<<<< HEAD
       = f.label :help_text, class: 'label-bold'
       = f.text_area :help_text, class: 'form-control', rows: 4
       .form-text.text-muted Markdown enabled
     .form-group
+=======
+>>>>>>> upstream/master
       = f.label :help_page_text, class: 'label-bold'
       = f.text_area :help_page_text, class: 'form-control', rows: 4
       .form-text.text-muted Markdown enabled