[2/3] accumulo git commit: ACCUMULO-4116 merge to 1.7

ACCUMULO-4116 merge to 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259

[2/3] accumulo git commit: ACCUMULO-4116 merge to 1.7

ACCUMULO-4116 merge to 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259