Merge remote-tracking branch 'upstream/master' into master-aic
Take out auth configuration for all but the *-auth.war package, so tests pass properly.
Merge branch 'master-aic' of https://github.com/nikhiltri/fcrepo4 into master-aic