ensure_ssl/0 if we need to, and move a comment to where it should be.
Merge bug26190
stable to default