ACCUMULO-2649 Get some more tests for the mapred RangeInputSplit
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormatTest.java