 Merge branch 'bug-to-ldap-configuration' into 'master'
 Merge branch 'bug-to-ldap-configuration' into 'master'

LDAP Configuration Fix

This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).

lvfeng1130/gitlabhq,bbodenmiller/gitlabhq,bladealslayer/gitlabhq,MauriceMohlek/gitlabhq,Kambda/Mobbr,luzhongyang/gitlabhq,DanielZhangQingLong/gitlabhq,stanhu/gitlabhq,nguyen-tien-mulodo/gitlabhq,atomaka/gitlabhq,lvfeng1130/gitlabhq,axilleas/gitlabhq,yonglehou/gitlabhq,rumpelsepp/gitlabhq,Exeia/gitlabhq,cui-liqiang/gitlab-ce,mathstuf/gitlabhq,jirutka/gitlabhq,SkyWei/gitlabhq,jaepyoung/gitlabhq,ibiart/gitlabhq,SVArago/gitlabhq,openwide-java/gitlabhq,phinfonet/mobbr-gitlabhq,kitech/gitlabhq,michaKFromParis/gitlabhqold,darkrasid/gitlabhq,Tyrael/gitlabhq,jirutka/gitlabhq,it33/gitlabhq,kotaro-dev/gitlab-6-9,michaKFromParis/gitlabhq,adaiguoguo/gitlab_globalserarch,ksoichiro/gitlabhq,sakishum/gitlabhq,TheWatcher/gitlabhq,theodi/gitlabhq,sekcheong/gitlabhq,NARKOZ/gitlabhq,DanielZhangQingLong/gitlabhq,vjustov/gitlabhq,ferdinandrosario/gitlabhq,Keystion/gitlabhq,fendoudeqingchunhh/gitlabhq,xuvw/gitlabhq,cui-liqiang/gitlab-ce,koreamic/gitlabhq,cncodog/gitlab,mrb/gitlabhq,fantasywind/gitlabhq,NuLL3rr0r/gitlabhq,manfer/gitlabhq,Tyrael/gitlabhq,dukex/gitlabhq,phinfonet/mobbr-gitlabhq,8thcolor/testing-public-gitlabhq,OtkurBiz/gitlabhq,luzhongyang/gitlabhq,revaret/gitlabhq,larryli/gitlabhq,jirutka/gitlabhq,Burick/gitlabhq,hzy001/gitlabhq,LytayTOUCH/gitlabhq,tim-hoff/gitlabhq,openwide-java/gitlabhq,ayufan/gitlabhq,yama07/gitlabhq,michaKFromParis/gitlabhqold,tk23/gitlabhq,fscherwi/gitlabhq,sekcheong/gitlabhq,adaiguoguo/gitlab_globalserarch,dwrensha/gitlabhq,NARKOZ/gitlabhq,williamherry/gitlabhq,sekcheong/gitlabhq,nmav/gitlabhq,icedwater/gitlabhq,dplarson/gitlabhq,larryli/gitlabhq,pulkit21/gitlabhq,fpgentil/gitlabhq,dvrylc/gitlabhq,jrjang/gitlabhq,H3Chief/gitlabhq,copystudy/gitlabhq,martijnvermaat/gitlabhq,hacsoc/gitlabhq,allysonbarros/gitlabhq,fgbreel/gitlabhq,larryli/gitlabhq,initiummedia/gitlabhq,xuvw/gitlabhq,stellamiranda/mobbr-gitlabhq,sonalkr132/gitlabhq,nmav/gitlabhq,zBMNForks/gitlabhq,whluwit/gitlabhq,axilleas/gitlabhq,Telekom-PD/gitlabhq,hq804116393/gitlabhq,ferdinandrosario/gitlabhq,nguyen-tien-mulodo/gitlabhq,sekcheong/gitlabhq,yatish27/gitlabhq,jvanbaarsen/gitlabhq,bbodenmiller/gitlabhq,123Haynes/gitlabhq,Datacom/gitlabhq,manfer/gitlabhq,since2014/gitlabhq,Kambda/mobbr-gitlabhq,ordiychen/gitlabhq,gopeter/gitlabhq,szechyjs/gitlabhq,windymid/test2,Soullivaneuh/gitlabhq,dwrensha/gitlabhq,yfaizal/gitlabhq,tk23/gitlabhq,eliasp/gitlabhq,stellamiranda/mobbr-gitlabhq,sideci-sample/sideci-sample-gitlabhq,yama07/gitlabhq,NARKOZ/gitlabhq,dukex/gitlabhq,ibiart/gitlabhq,akumetsuv/gitlab,hq804116393/gitlabhq,OlegGirko/gitlab-ce,bbodenmiller/gitlabhq,salipro4ever/gitlabhq,revaret/gitlabhq,TheWatcher/gitlabhq,mente/gitlabhq,gopeter/gitlabhq,rhels/gitlabhq,jrjang/gitlab-ce,LUMC/gitlabhq,childbamboo/gitlabhq,mmkassem/gitlabhq,stoplightio/gitlabhq,mavimo/gitlabhq,flashbuckets/gitlabhq,zBMNForks/gitlabhq,kemenaran/gitlabhq,theodi/gitlabhq,Keystion/gitlabhq,jaepyoung/gitlabhq,tempbottle/gitlabhq,windymid/test2,kitech/gitlabhq,duduribeiro/gitlabhq,childbamboo/gitlabhq,martinma4/gitlabhq,dreampet/gitlab,manfer/gitlabhq,pjknkda/gitlabhq,cncodog/gitlab,dreampet/gitlab,tempbottle/gitlabhq,shinexiao/gitlabhq,williamherry/gitlabhq,pjknkda/gitlabhq,fgbreel/gitlabhq,Exeia/gitlabhq,youprofit/gitlabhq,ferdinandrosario/gitlabhq,jvanbaarsen/gitlabhq,k4zzk/gitlabhq,ikappas/gitlabhq,Razer6/gitlabhq,williamherry/gitlabhq,michaKFromParis/sparkslab,yfaizal/gitlabhq,ayufan/gitlabhq,rfeese/gitlab-ce,michaKFromParis/sparkslab,8thcolor/testing-public-gitlabhq,jrjang/gitlabhq,chadyred/gitlabhq,childbamboo/gitlabhq,liyakun/gitlabhq,SVArago/gitlabhq,axilleas/gitlabhq,mrb/gitlabhq,kemenaran/gitlabhq,kemenaran/gitlabhq,rfeese/gitlab-ce,zrbsprite/gitlabhq,sideci-sample/sideci-sample-gitlabhq,NKMR6194/gitlabhq,copystudy/gitlabhq,jaepyoung/gitlabhq,initiummedia/gitlabhq,mr-dxdy/gitlabhq,rfeese/gitlab-ce,sonalkr132/gitlabhq,mente/gitlabhq,OlegGirko/gitlab-ce,ayufan/gitlabhq,eliasp/gitlabhq,windymid/test2,Datacom/gitlabhq,LUMC/gitlabhq,WSDC-NITWarangal/gitlabhq,openwide-java/gitlabhq,zBMNForks/gitlabhq,liyakun/gitlabhq,SVArago/gitlabhq,bigsurge/gitlabhq,childbamboo/gitlabhq,adaiguoguo/gitlab_globalserarch,mathstuf/gitlabhq,Soullivaneuh/gitlabhq,michaKFromParis/sparkslab,folpindo/gitlabhq,delkyd/gitlabhq,fearenales/gitlabhq,fpgentil/gitlabhq,fendoudeqingchunhh/gitlabhq,yuyue2013/ss,rhels/gitlabhq,dwrensha/gitlabhq,michaKFromParis/gitlabhqold,ikappas/gitlabhq,NKMR6194/gitlabhq,dreampet/gitlab,aaronsnyder/gitlabhq,nmav/gitlabhq,nguyen-tien-mulodo/gitlabhq,folpindo/gitlabhq,gorgee/gitlabhq,theonlydoo/gitlabhq,dplarson/gitlabhq,allysonbarros/gitlabhq,yonglehou/gitlabhq,ZeoAlliance/gitlabhq,michaKFromParis/gitlabhqold,allistera/gitlabhq,flashbuckets/gitlabhq,icedwater/gitlabhq,shinexiao/gitlabhq,louahola/gitlabhq,duduribeiro/gitlabhq,wangcan2014/gitlabhq,allysonbarros/gitlabhq,fscherwi/gitlabhq,yulchitaj/TEST3,lvfeng1130/gitlabhq,OlegGirko/gitlab-ce,julianengel/gitlabhq,julianengel/gitlabhq,fearenales/gitlabhq,zrbsprite/gitlabhq,since2014/gitlabhq,stoplightio/gitlabhq,pkgr/gitlabhq,Burick/gitlabhq,bigsurge/gitlabhq,phinfonet/mobbr-gitlabhq,cncodog/gitlab,duduribeiro/gitlabhq,Devin001/gitlabhq,yama07/gitlabhq,Telekom-PD/gitlabhq,LytayTOUCH/gitlabhq,NKMR6194/gitlabhq,lvfeng1130/gitlabhq,chenrui2014/gitlabhq,rumpelsepp/gitlabhq,mmkassem/gitlabhq,per-garden/gitlabhq,rhels/gitlabhq,louahola/gitlabhq,ZeoAlliance/gitlabhq,theodi/gitlabhq,iiet/iiet-git,darkrasid/gitlabhq,Datacom/gitlabhq,mathstuf/gitlabhq,stellamiranda/mobbr-gitlabhq,ngpestelos/gitlabhq,H3Chief/gitlabhq,whluwit/gitlabhq,TheWatcher/gitlabhq,wangcan2014/gitlabhq,allistera/gitlabhq,whluwit/gitlabhq,bladealslayer/gitlabhq,jrjang/gitlabhq,OtkurBiz/gitlabhq,OlegGirko/gitlab-ce,akumetsuv/gitlab,bozaro/gitlabhq,kitech/gitlabhq,akumetsuv/gitlab,ZeoAlliance/gitlabhq,Telekom-PD/gitlabhq,zBMNForks/gitlabhq,yatish27/gitlabhq,theonlydoo/gitlabhq,iiet/iiet-git,yulchitaj/TEST3,kotaro-dev/gitlab-6-9,szechyjs/gitlabhq,MauriceMohlek/gitlabhq,kemenaran/gitlabhq,delkyd/gitlabhq,louahola/gitlabhq,SkyWei/gitlabhq,NuLL3rr0r/gitlabhq,martijnvermaat/gitlabhq,daiyu/gitlab-zh,tempbottle/gitlabhq,mr-dxdy/gitlabhq,salipro4ever/gitlabhq,bbodenmiller/gitlabhq,ibiart/gitlabhq,aaronsnyder/gitlabhq,pulkit21/gitlabhq,rebecamendez/gitlabhq,fgbreel/gitlabhq,hacsoc/gitlabhq,chenrui2014/gitlabhq,shinexiao/gitlabhq,julianengel/gitlabhq,iiet/iiet-git,dukex/gitlabhq,OtkurBiz/gitlabhq,gorgee/gitlabhq,mavimo/gitlabhq,TheWatcher/gitlabhq,michaKFromParis/gitlabhq,mmkassem/gitlabhq,nmav/gitlabhq,Telekom-PD/gitlabhq,wangcan2014/gitlabhq,Keystion/gitlabhq,sue445/gitlabhq,cncodog/gitlab,szechyjs/gitlabhq,fantasywind/gitlabhq,DanielZhangQingLong/gitlabhq,hacsoc/gitlabhq,initiummedia/gitlabhq,fantasywind/gitlabhq,ksoichiro/gitlabhq,theonlydoo/gitlabhq,Exeia/gitlabhq,pkgr/gitlabhq,flashbuckets/gitlabhq,zrbsprite/gitlabhq,duduribeiro/gitlabhq,rfeese/gitlab-ce,yama07/gitlabhq,ordiychen/gitlabhq,LUMC/gitlabhq,MauriceMohlek/gitlabhq,screenpages/gitlabhq,jaepyoung/gitlabhq,rumpelsepp/gitlabhq,Soullivaneuh/gitlabhq,johnmyqin/gitlabhq,WSDC-NITWarangal/gitlabhq,jirutka/gitlabhq,t-zuehlsdorff/gitlabhq,Devin001/gitlabhq,dvrylc/gitlabhq,Kambda/Mobbr,mrb/gitlabhq,htve/GitlabForChinese,rhels/gitlabhq,eliasp/gitlabhq,fearenales/gitlabhq,Burick/gitlabhq,mr-dxdy/gitlabhq,michaKFromParis/gitlabhq,hq804116393/gitlabhq,H3Chief/gitlabhq,sue445/gitlabhq,it33/gitlabhq,johnmyqin/gitlabhq,vjustov/gitlabhq,k4zzk/gitlabhq,cui-liqiang/gitlab-ce,ikappas/gitlabhq,SVArago/gitlabhq,8thcolor/testing-public-gitlabhq,Tyrael/gitlabhq,ferdinandrosario/gitlabhq,sonalkr132/gitlabhq,flashbuckets/gitlabhq,vjustov/gitlabhq,yulchitaj/TEST3,xuvw/gitlabhq,delkyd/gitlabhq,folpindo/gitlabhq,atomaka/gitlabhq,H3Chief/gitlabhq,stanhu/gitlabhq,LytayTOUCH/gitlabhq,zrbsprite/gitlabhq,martijnvermaat/gitlabhq,Keystion/gitlabhq,chenrui2014/gitlabhq,dplarson/gitlabhq,ttasanen/gitlabhq,cinderblock/gitlabhq,gopeter/gitlabhq,johnmyqin/gitlabhq,chadyred/gitlabhq,screenpages/gitlabhq,manfer/gitlabhq,rumpelsepp/gitlabhq,tim-hoff/gitlabhq,mr-dxdy/gitlabhq,mente/gitlabhq,Kambda/mobbr-gitlabhq,chadyred/gitlabhq,sue445/gitlabhq,LUMC/gitlabhq,mavimo/gitlabhq,fpgentil/gitlabhq,tk23/gitlabhq,daiyu/gitlab-zh,initiummedia/gitlabhq,Devin001/gitlabhq,jvanbaarsen/gitlabhq,since2014/gitlabhq,Exeia/gitlabhq,k4zzk/gitlabhq,koreamic/gitlabhq,jrjang/gitlab-ce,ngpestelos/gitlabhq,youprofit/gitlabhq,liyakun/gitlabhq,fearenales/gitlabhq,chenrui2014/gitlabhq,bozaro/gitlabhq,martinma4/gitlabhq,yfaizal/gitlabhq,michaKFromParis/sparkslab,Kambda/Mobbr,yfaizal/gitlabhq,per-garden/gitlabhq,LytayTOUCH/gitlabhq,allistera/gitlabhq,htve/GitlabForChinese,folpindo/gitlabhq,sakishum/gitlabhq,Kambda/mobbr-gitlabhq,it33/gitlabhq,sakishum/gitlabhq,Razer6/gitlabhq,cinderblock/gitlabhq,joalmeid/gitlabhq,screenpages/gitlabhq,ttasanen/gitlabhq,ngpestelos/gitlabhq,NKMR6194/gitlabhq,luzhongyang/gitlabhq,youprofit/gitlabhq,Burick/gitlabhq,youprofit/gitlabhq,mmkassem/gitlabhq,pjknkda/gitlabhq,ordiychen/gitlabhq,yulchitaj/TEST3,theonlydoo/gitlabhq,theodi/gitlabhq,NuLL3rr0r/gitlabhq,darkrasid/gitlabhq,martijnvermaat/gitlabhq,axilleas/gitlabhq,yuyue2013/ss,revaret/gitlabhq,hq804116393/gitlabhq,salipro4ever/gitlabhq,sonalkr132/gitlabhq,julianengel/gitlabhq,pulkit21/gitlabhq,ttasanen/gitlabhq,fantasywind/gitlabhq,bigsurge/gitlabhq,mrb/gitlabhq,martinma4/gitlabhq,atomaka/gitlabhq,t-zuehlsdorff/gitlabhq,it33/gitlabhq,dvrylc/gitlabhq,delkyd/gitlabhq,whluwit/gitlabhq,ngpestelos/gitlabhq,ordiychen/gitlabhq,123Haynes/gitlabhq,luzhongyang/gitlabhq,pkgr/gitlabhq,k4zzk/gitlabhq,icedwater/gitlabhq,mathstuf/gitlabhq,sideci-sample/sideci-sample-gitlabhq,stoplightio/gitlabhq,WSDC-NITWarangal/gitlabhq,nguyen-tien-mulodo/gitlabhq,ksoichiro/gitlabhq,pjknkda/gitlabhq,t-zuehlsdorff/gitlabhq,WSDC-NITWarangal/gitlabhq,dplarson/gitlabhq,jrjang/gitlab-ce,liyakun/gitlabhq,Razer6/gitlabhq,joalmeid/gitlabhq,pulkit21/gitlabhq,bladealslayer/gitlabhq,Tyrael/gitlabhq,rebecamendez/gitlabhq,ttasanen/gitlabhq,MauriceMohlek/gitlabhq,koreamic/gitlabhq,copystudy/gitlabhq,fscherwi/gitlabhq,szechyjs/gitlabhq,jrjang/gitlabhq,iiet/iiet-git,allistera/gitlabhq,darkrasid/gitlabhq,hzy001/gitlabhq,allysonbarros/gitlabhq,123Haynes/gitlabhq,bozaro/gitlabhq,eliasp/gitlabhq,since2014/gitlabhq,DanielZhangQingLong/gitlabhq,yatish27/gitlabhq,dukex/gitlabhq,stoplightio/gitlabhq,icedwater/gitlabhq,OtkurBiz/gitlabhq,tk23/gitlabhq,tim-hoff/gitlabhq,gorgee/gitlabhq,joalmeid/gitlabhq,tempbottle/gitlabhq,williamherry/gitlabhq,per-garden/gitlabhq,michaKFromParis/gitlabhq,yatish27/gitlabhq,wangcan2014/gitlabhq,fscherwi/gitlabhq,openwide-java/gitlabhq,copystudy/gitlabhq,per-garden/gitlabhq,larryli/gitlabhq,kotaro-dev/gitlab-6-9,sue445/gitlabhq,daiyu/gitlab-zh,gorgee/gitlabhq,stanhu/gitlabhq,yuyue2013/ss,hzy001/gitlabhq,hacsoc/gitlabhq,htve/GitlabForChinese,dreampet/gitlab,t-zuehlsdorff/gitlabhq,vjustov/gitlabhq,mente/gitlabhq,hzy001/gitlabhq,mavimo/gitlabhq,screenpages/gitlabhq,martinma4/gitlabhq,shinexiao/gitlabhq,ksoichiro/gitlabhq,NARKOZ/gitlabhq,bigsurge/gitlabhq,Soullivaneuh/gitlabhq,cinderblock/gitlabhq,yonglehou/gitlabhq,jrjang/gitlab-ce,johnmyqin/gitlabhq,kitech/gitlabhq,yonglehou/gitlabhq,chadyred/gitlabhq,fendoudeqingchunhh/gitlabhq,rebecamendez/gitlabhq,koreamic/gitlabhq,revaret/gitlabhq,Razer6/gitlabhq,dvrylc/gitlabhq,salipro4ever/gitlabhq,SkyWei/gitlabhq,SkyWei/gitlabhq,cui-liqiang/gitlab-ce,Datacom/gitlabhq,ayufan/gitlabhq,daiyu/gitlab-zh,sakishum/gitlabhq,aaronsnyder/gitlabhq,rebecamendez/gitlabhq,louahola/gitlabhq,Devin001/gitlabhq,gopeter/gitlabhq,dwrensha/gitlabhq,jvanbaarsen/gitlabhq,tim-hoff/gitlabhq,cinderblock/gitlabhq,fpgentil/gitlabhq,fgbreel/gitlabhq,ikappas/gitlabhq,aaronsnyder/gitlabhq,htve/GitlabForChinese,stanhu/gitlabhq,fendoudeqingchunhh/gitlabhq,yuyue2013/ss,joalmeid/gitlabhq,bozaro/gitlabhq,adaiguoguo/gitlab_globalserarch