Update the ldap/profile feature with a new profile field and the authorization settings.
Fix merge conflicts on the updated profile and ldap settings.