Prevent redeclaration of LDAP strategy
Default the LDAP server label to LDAP
Merge branch 'ldap-fixes' into 'master'

Ldap fixes

Solves #1688 and #1686

See merge request !1193
Merge branch 'master' of github.com:gitlabhq/gitlabhq