CMS-4396 Replace AccoutKey with PrincipalKey. Removed UserKey.