Merge "Error in Jetty logs" into release-1.1.0