When STARTTLS fails, there are two distinct types of failure. Each type should be handled in a distinct manner. Note that this commit applies a fix to the S2S code only. C2S may also need work.
