LDAP password setting update
Merge branch '2.2i5' into qa-sprint