Apply John Jetmore's patch to allow tls-on-connect and STARTTLS to be