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

This reverts commit 7290477f39ccddf7fb6d50be5b55e3f559b9ff34.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the zeroconf_avahi_demos sub directory