ACCUMULO-1640 Remove unnecessary exception and clean up imports
Merge remote-tracking branch 'asf/master' into ACCUMULO-802