Added aliases to IIS datapoints
Added more aliases
Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.Microsoft.Windows into develop
Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.Microsoft.Windows into develop
Merge pull request #265 from ssamartyn/develop

Fix for ZEN-15433
Fixes ZEN-15495
Merge pull request #266 from zenoss/feature/ZEN-15495

Fixes ZEN-15495
Added 2 views to analytics
Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.Microsoft.Windows into develop
Merge pull request #267 from ssvsergeyev/develop

Added Ad Hoc views
Fixes ZEN-15434
Merge pull request #268 from zenoss/feature/ZEN-15434

Fixes ZEN-15434
Fixes ZEN-15593
Merge pull request #269 from zenoss/feature/ZEN-15593

Fixes ZEN-15593
Fix for ZEN-15240
Merge remote branch 'upstream/develop' into develop