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

This reverts commit 2b09a7fbb13bc66c279354eeec7383b9919115e9.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the zeroconf_avahi_suite sub directory