Merge pull request #2498 from cshore/pull-request-collectd-encrypted-networking