Upgraded relevant parts to pax-wicket 3.0.1