Merge branch 'feature/ZEN-9281' into develop
Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.Microsoft.Windows into develop
Version 2.0.0dev59 -> 2.0.0dev60.