Merge branch '1.6' into 1.7
Conflicts:
core/src/main/java/org/apache/accumulo/core/Constants.java
core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java
test/src/test/java/org/apache/accumulo/harness/MiniClusterHarness.java
test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java
test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java
test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java
trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
