Merge branch 'release/2.1.0'
Fix for ZEN-13588
Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.Microsoft.Windows into develop
Merge pull request #223 from ssamartyn/develop

Fixed defect ZEN-13190
Merge pull request #222 from ssvsergeyev/develop

Fix for ZEN-13588
Fix for ZEN-13662
Fix for ZEN-13662: fixed property id
Merge pull request #224 from ssvsergeyev/develop

Fix for ZEN-13662
release: version 2.1.0 -> 2.1.2
Merge branch 'release/2.1.2'
rework the dbinstances grid such that it will be more forward compatible between ext versions
bump version for hotfix ZEN-14708
Merge pull request #239 from zenoss/hotfix/ZEN-14708

rework the dbinstances grid such that it will be more forward compatible between ext versions
New license
release: version 2.2.0dev -> 2.2.0
Merge pull request #299 from zenoss/master

Master