Merge more SSL tests and required ssl_server2 additions