[3/3] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 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/837a0bdf Tree: http://git-wip-us.apache.org/repos/asf/a

[3/3] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e49a97ad Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e49a97ad Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e49a97ad