ACCUMULO-802 Address some issues from ReviewBoard