Merge branch '1.6' into 1.7
No change to 1.7+ (ACCUMULO-4459 only affects 1.6)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/896aa4ad
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/896aa4ad
Diff: http://gi
Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d7716d32
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d7716d32
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d7716d32