fixes ZEN-15423: added PropertyMonitor ZP and switched vSphere to master branch

https://jira.zenoss.com/browse/ZEN-15423