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
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
Merge remote-tracking branch 'upstream/master' into add-nicknames-for-pzh-users