Fix config key name

and remove stray merge conflict marker
86 jobs for mk-fix-ldap-encryption-doc in 122 minutes and 53 seconds (queued for 6 seconds)