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