Merge branch 'master' of https://github.com/fcrepo4/fcrepo4
Fixed CND indexing NS error; updated federeated folder paths; updated initial JCR tree.
Merge branch 'master-aic' of https://github.com/aic-collections/aicdams-lake into master-aic