Merge pull request #3061 from mpg/skip-close-notify-2.7

[backport 2.7] Fix possible close_notify/ClientHello confusion