Merge branch '1.7'
Conflicts:
core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java
test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java
test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java
test/src/main/java/org/apache/accumulo/test/functional/ExamplesIT.java
test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java
test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java
test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
test/src/test/java/org/apache/accumulo/test/AccumuloOutputFormatIT.java
