Added filtering of local zones based on mdns activity as well.
Merge branch 'vancouver'