ACCUMULO-259 - had unmerged stuff in the javadocs



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