Merge "Add RBAC logic to salt module for ACL per UUID/name"