Bring back the multi-homed server fixes from revision 1.6.  They got klobered when the formating changes were "undone".
Bring back the multi-homed server fixes from revision 1.6.  They got
klobered when the formating changes were "undone".

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase