Improve default for ldap.userName
Merge branch 'develop'