[9/9] accumulo git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9edeca84 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/t

[9/9] accumulo git commit: Merge branch '1.6'

Merge branch '1.6' Conflicts: minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterStartStopTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/26db8eea Tree: http://git-wip-us.apa