Improve internal documentation of the configuration file.
Fix the default LDAP properties to match the configuration documentation.
Merge branch 'master' into detect-base-context