ACCUMULO-1452, ACCUMULO-1502 Remove warnings introduced previously