Updated versions; jettywrapper has now been fixed in 1.8.2 so no need to pin it back to 1.7.0