Work in progress
Merge branch 'hh6-fcrepo-admin' into hydra-head-6