ACCUMULO-259 ACCUMULO-971 - more missed merges. Remaining javadoc inconsistencies will be addressed after ACCUMULO-1041



git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1442440 13f79535-47bb-0310-9956-ffa450edef68