Bring jsp up to date with 3.10 version