Sync with 5.4 release and alpha StartTLS code.

Syncronized with 5.4 release and alpha StarTLS code (GUI included.)