Merge branch 'master' into 49836979-maven-checkstyles

Opted to use 'theirs' rather than deal with the conflicts.

Conflicts:
	fcrepo-kernel/src/main/java/org/fcrepo/services/MetricsService.java