LPS-37901 Correct test fix
LPS-38018 Solve by reverting fix for LPS-37846

Reverting b5bae9763758789 because it causes problems in some environments
LPS-37990 upgraded Jetty 8 to 9
LPS-37990 SF
LPS-37990 Upgrade jars
LPS-37990 Regen