Merge pull request #353 from peternewman/e1.37-2

Fix some FreeBSD issues
Remove htons from BonjourDiscoveryAgent