MFC ir206152, r206153, r206154: - Stop adding trailing '\n'.  The servent_unpack() doesn't expect   lines terminated with '\n'. - Treat '+' as special only when in compat mode, and simplify   the logic bit. - Reduce duplicate code.
MFC ir206152, r206153, r206154:
- Stop adding trailing '\n'.  The servent_unpack() doesn't expect
  lines terminated with '\n'.
- Treat '+' as special only when in compat mode, and simplify
  the logic bit.
- Reduce duplicate code.

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