Fix merge conflict causing bug in inter-zone connections

Simple merge conflict caused a problem with inter-zone
communication.  This is the fix.

Jira issue: WP-955
Merge pull request #4 from jplyle/fix-merge-issue

Fix merge conflict causing bug in inter-zone connections