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

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

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

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