K2 - RBAC Admin service bug fixes