[2/6] 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/14e3a7d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/14e3a7d5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/14e3a7d5

[2/6] 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