Merge "Move ldap image to separate file as it's not always required" into release/2019.2.0