bug 1288: EHLO returns 250 on success
bug 1288: Actually request encryption for the connection before activating
Merge branch 'bug-1288' into testserver-stable