Catchup with RC16 branch on SVN repo.
Added our SSL hotfix in servername_callback.