Merge branch 'master' into resurrect_hooks

Conflicts:
	src/cli/src/test/java/org/geogit/cli/test/functional/CLITestContextBuilder.java