Remove inadvertently committed debug System.out
Fix failing tests
Backport Jetty/Tomcat SSL support

Fixes gh-1570
Cherry-picked from 0960908 and 258c6f1