Merge branch 'master' into WrongMerge

Conflicts:
	src/main/java/edu/jhuapl/tinkerpop/AccumuloGraphConfiguration.java


Reverting Last merge -- chose the wrong parent