Merge pull request #220 from ssamartyn/develop

Fixed defect ZEN-13368
Fix for ZEN-13549
Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.Microsoft.Windows into develop
Merge pull request #221 from ssvsergeyev/develop

Fix for ZEN-13549
Fixed defect ZEN-13190
Merge remote branch 'upstream/develop' into develop