DDF-493: Updated due to pax-web change.

Also changed to remove conflicting version from 2.4.x branch.