Revert "Trimmed the branch to only the zeroconf_avahi sub directory"

This reverts commit df55a4e1031be40210b7e3abe92b830400671b1e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the zeroconf_avahi sub directory