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'
ACCUMULO-2660 handle invocation ex in dfslogger
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2171 Include ReadWriteIT (SunnyDay) tests in release:prepare
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2482 add units to error msg on ZK retries

Signed-off-by: Bill Havanki <bhavanki@cloudera.com>
Merge branch '1.4.6-SNAPSHOT' into 1.5.2-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2494 add commons-math to 1.6 tarball
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2659 Properly deprecate public API changes to mapred utils
ACCUMULO-2171 Update CHANGES

  Include ACCUMULO-1486, ACCUMULO-2482, ACCUMULO-2659, ACCUMULO-2660
ACUMULO-2659 Replace some more methods for api's sake
ACCUMULO-2659 added MRE constructor back and deprecated it
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
	core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/OutputConfigurator.java
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
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