ACL manager and resource fixes, including changes to the ACL entities