Bugzilla #1006: Keep EHLO attributes in case STARTTLS errors are ignored