Re-merged avahi from GPL archive, previous changes broke as much as they fixed in the build process