Merge branch 'master' into command_hints

Conflicts:
	src/cli/src/main/java/org/geogit/cli/CLIInjectorBuilder.java
	src/cli/src/main/java/org/geogit/cli/GeogitCLI.java
	src/geotools/src/test/java/org/geogit/geotools/cli/test/functional/IniOracleProperties.java