[10.3] CE to EE stables - 11th December

For the record:

• CE and EE stable branches were frozen on the 8th
  • https://gitlab.com/gitlab-org/gitlab-ce/commits/10-3-stable
  • https://gitlab.com/gitlab-org/gitlab-ee/commits/10-3-stable-ee
• CE to EE into stables were generating lots of conflicts (see https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3690)
• https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3654 was picked into 10-3-stable-ee (ideally to reduce the amount of conflicts)
• The result is this branch, which again had lots of conflicts to be resolved