Merge pull request #259 from zenoss/feature/ZEN-15495

ZEN-15495
Fix for ZEN-10265
Merge remote branch 'upstream/develop' into develop
Fixes ZEN-15493
Merge pull request #260 from ssamartyn/develop

Fix for ZEN-10265
More Fixes for ZEN-14593
fix comments
Merge pull request #262 from zenoss/feature/ZEN-15493

Feature/zen 15493
Merge branch 'feature/ZEN-15493' into develop
Merge branch 'develop' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows into develop
Fixes ZEN-15519
Merge pull request #264 from zenoss/feature/ZEN-15519

Feature/zen 15519
Fixes ZEN-15495