Added SslContextFactory changes required by Jetty 8+
Merge branch 'fedora-patch-jetty' into fedora-branch-2-integration
Merge branch 'fedora-branch-2-integration' into fedora-branch-2-test