Merge "Enable TLS for OpenLDAP" into release/proposed/2019.2.0