CMS-4396 Replace AccoutKey with PrincipalKey. Removed old group, role and account. Still using UserKey.