ACCUMULO-2586 Ensure that all of the constructors from 1.5.0 are present
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
Merge branch '1.6.0-SNAPSHOT'