Removed garbage comments.
Fix avahi_config_test.
Merge pull request #1335 from jimis/multi-tenancy

Multi tenancy - fix avahi_config_test