[Sathish/Mani/Deepak] Fixed tests and Upgraded Jetty to 9