Merge pull request #275 from ssamartyn/develop

Fix for ZEN-13546
Merge branch 'feature/ZEN-11568' into develop
Merge branch 'develop' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows into develop
Fixes ZEN-15671
Merge pull request #276 from zenoss/feature/ZEN-15671

Feature/zen 15671
Fix for ZEN-13546
Merge remote branch 'upstream/develop' into develop