Add cross-zone Findservice support

Jira Issue: WP-346