Moved CHANGELOG entry up to help avoid future conflicts
Moved CHANGELOG entry up to help avoid future conflicts

rebased with latest changes from master

openwide-java/gitlabhq,LUMC/gitlabhq,icedwater/gitlabhq,shinexiao/gitlabhq,shinexiao/gitlabhq,dplarson/gitlabhq,openwide-java/gitlabhq,dplarson/gitlabhq,iiet/iiet-git,mr-dxdy/gitlabhq,martijnvermaat/gitlabhq,allysonbarros/gitlabhq,allysonbarros/gitlabhq,mr-dxdy/gitlabhq,SVArago/gitlabhq,martijnvermaat/gitlabhq,shinexiao/gitlabhq,axilleas/gitlabhq,stoplightio/gitlabhq,screenpages/gitlabhq,axilleas/gitlabhq,mmkassem/gitlabhq,t-zuehlsdorff/gitlabhq,openwide-java/gitlabhq,jirutka/gitlabhq,SVArago/gitlabhq,mmkassem/gitlabhq,icedwater/gitlabhq,dreampet/gitlab,dplarson/gitlabhq,stoplightio/gitlabhq,stoplightio/gitlabhq,jirutka/gitlabhq,screenpages/gitlabhq,daiyu/gitlab-zh,t-zuehlsdorff/gitlabhq,mr-dxdy/gitlabhq,darkrasid/gitlabhq,iiet/iiet-git,iiet/iiet-git,mmkassem/gitlabhq,dreampet/gitlab,iiet/iiet-git,t-zuehlsdorff/gitlabhq,SVArago/gitlabhq,htve/GitlabForChinese,daiyu/gitlab-zh,daiyu/gitlab-zh,mr-dxdy/gitlabhq,dplarson/gitlabhq,icedwater/gitlabhq,martijnvermaat/gitlabhq,axilleas/gitlabhq,daiyu/gitlab-zh,t-zuehlsdorff/gitlabhq,icedwater/gitlabhq,SVArago/gitlabhq,mmkassem/gitlabhq,axilleas/gitlabhq,jirutka/gitlabhq,jirutka/gitlabhq,screenpages/gitlabhq,dreampet/gitlab,allysonbarros/gitlabhq,shinexiao/gitlabhq,martijnvermaat/gitlabhq,openwide-java/gitlabhq,dreampet/gitlab,darkrasid/gitlabhq,screenpages/gitlabhq,LUMC/gitlabhq,darkrasid/gitlabhq,allysonbarros/gitlabhq,htve/GitlabForChinese,htve/GitlabForChinese,htve/GitlabForChinese,LUMC/gitlabhq,darkrasid/gitlabhq,LUMC/gitlabhq,stoplightio/gitlabhq