More cleanup and streamlining of acl functions and tests
Add a couple of tests for the nasty linking helpers
Clean up and reformat poms, upgrade various build dependencies
Add some boilerplate tests for singleton classes
Merge branch 'master' into acl_graph

Conflicts:
	ehri-extension/src/main/java/eu/ehri/extension/PermissionsResource.java