Merge "Fix issue with unencrypted openldap admin password" into release/2019.2.0