Bug fixing of service options on the PZH

Corrected PZH service unregister and register option

Jira Issue: WP-528
Merge pull request #429 from habibvirji/WP-528-Refactor-PZH

Bug fixing of service options on the PZH
Merge remote-tracking branch 'upstream/master' into Sib_Disco
Update per review comments

Jira Issue: WP-346