- Remove the previous generic option loading, which wouldn't work for
SSL (because we need a dictionary) and that was all we really cared
about.

 - Load the various SSL options from the environment if they are
present and not in the arguments.

 - Skip this for any localhost connection because TLS doesn't make
sense there.

If ssl is not missing but =None, then do not do the environment load.



The currently behaviour has ssl=None fail when it tries to make a TLS
connection, so this shouldn't break anything, and allows the system to
be bypassed when needed.

If we are making a connection to localhost, then passing anything for
SSL will always mean a failed connection, because a certificate cannot
be verified (if TCP/IP) or SSL doesn't make sense (if UNIX).



Make it easier to call connect with ssl values by always ignoring them
in the localhost case. This means that callers do not need to check if
the host is localhost and can simply always provide an SSL value (e.g.
if the host is a variable).

…into MMA-3573

MMA-3573. Update from upstream