ldap over ssl instruction improvement (rebased onto develop)



This is the same as gh-781 but rebased onto develop.

----

small adjustments following @stick email