Upgrade to 5.4-beta-22
Fix JettyRunner