ACCUMULO-802 fix more issues from ReviewBoard