ACCUMULO-2874 update the docs to match the actual API
ACCUMULO-2874 update the docs to match the actual API
Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT