Merge "Permit use of sudo-ldap instead of sudo package"