Fixed merge conflict that caused tests to fail with build
Fixed merge conflict that caused tests to fail with build

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