add changes from EE-updates
add changes from EE-updates

from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2350
+ copyedit (goes  with 80edf00)

dreampet/gitlab,axilleas/gitlabhq,jirutka/gitlabhq,dreampet/gitlab,mmkassem/gitlabhq,dplarson/gitlabhq,dreampet/gitlab,t-zuehlsdorff/gitlabhq,dplarson/gitlabhq,mmkassem/gitlabhq,stoplightio/gitlabhq,iiet/iiet-git,mmkassem/gitlabhq,iiet/iiet-git,t-zuehlsdorff/gitlabhq,mmkassem/gitlabhq,iiet/iiet-git,jirutka/gitlabhq,jirutka/gitlabhq,stoplightio/gitlabhq,axilleas/gitlabhq,t-zuehlsdorff/gitlabhq,axilleas/gitlabhq,dplarson/gitlabhq,stoplightio/gitlabhq,axilleas/gitlabhq,iiet/iiet-git,stoplightio/gitlabhq,t-zuehlsdorff/gitlabhq,dreampet/gitlab,jirutka/gitlabhq,dplarson/gitlabhq