ACCUMULO-670 ACCUMULO-765 - addressed minor api change



git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1449793 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-670 ACCUMULO-765 - merging 1449793 to trunk. Plus a little extra, it looks like?



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