PZH port handling during certificate exchange

Jira Issue: WP-528