Merge remote-tracking branch 'origin/master' into blongo

Conflicts:
	src/storage/mongo/src/test/java/org/geogit/storage/integration/mongo/MongoGraphDatabaseTest.java