Fixed ZEN-11828 issue
Merge remote branch 'upstream/develop' into develop
Removed unnecessary code from objects.xml
Merge remote branch 'upstream/develop' into develop
Corrected getRRDTemplates method according to comments
Merge remote branch 'upstream/develop' into develop
Merge branch 'develop' of github.com:ssOleg/ZenPacks.zenoss.Microsoft.Windows into develop
Added the unit test for getRRDTemplates method
Fixed preserving order when setting appropriate templates
Merge pull request #185 from ssOleg/develop

Fixed ZEN-11828 issue