ACCUMULO-2468 Remove recently introduced warnings