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
Build serviceCache from available API modules

serviceCache will be build from the modules available in node_modules/

Jira-issue: WP-10002
Merge pull request #6 from aldafu/WP-1002-build-serviceCache-from-available-mods

Build serviceCache from available API modules
Added support for the Synchronization
pass path to node_modules to module loading funcs

fixes loading api modules that are installed with npm link.

Jira-issue: WP-1018
Merge pull request #7 from aldafu/WP-1018-fix-loading-npm-linked-modules

pass path to node_modules to module loading funcs
PZH - PZH certificate exchange improvements

Jira Issue: WP-955
Merge remote-tracking branch 'upstream/master'
Sync start point on PZH

Jira Issue: WP-955
Long PZP name support
Update pzh_tlsSessionHandling.js
Update package.json
Update pzh_tlsSessionHandling.js
Remove truncating of PZP

Jira Issue: WP-955
Review comments

Jira Issue: WP-995
Removed D from pzpId

Jira Issue: WP-995
Merge pull request #9 from habibvirji/master

Synchronization Manager and Id changes