CORE-4820: changed the configuration setting names for passwords so that the password obfuscation in the property logging will work