Merge branch '6-2-stable' of git.xnodes.com:ops/gitlab into 6-2-stable
Adapt to Augmentum IES ldap.

Don't know who made this change, I'm just committing it here. There was
some other chagnes, lost them accidently, sorry.