Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ee into make-GitLab-Gold-button-more-cta

# Conflicts:
#	ee/app/views/shared/billings/_billing_plan_header.html.haml