Apply patch from BJ Hargrave that moves AdminPermissionCollection out of AdminPermission. Minus the part of the patch that makes Signer none public - I'll comment on the JIRA separately. (FELIX-22)