OPENAM-7835 Fix an issue with ACL rules meaning that users could not update their password
Final copies to complete maven_merge branch to be promoted to a final Trunk Version.