ACCUMULO-2128 Remove warnings introduced by merge