[12/13] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7c79d3d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a7c79d3d Diff: http://git-wip-us.apache.org/repo

[12/13] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a6bf35ab Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a6bf35ab Diff: http://git-wip-us.apache.org/repo