Allow both IPv4 and IPv6 addresses to be used.
Add support for sending monitoring info.
Merge pull request #3625 from bbockelm/multisource-bugfixes-v2

Re-add missing features in multisource code