Fix for ZEN-10939
Merge branch 'develop' of https://github.com/ssvsergeyev/ZenPacks.zenoss.Microsoft.Windows into develop