ACCUMULO-1784 fix minimum block size complaint for hadoop-2.2.0
ACCUMULO-1784 fix minimum block size complaint for hadoop-2.2.0

Conflicts:
	start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
Merge branch '1.5.1-SNAPSHOT'

Conflicts:
	start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java