Merge "Move ldap image to separate file as it's not always required"