Merge pull request #189 from ssirushchyshyn/develop

ZEN-12151
Merge remote-tracking branch 'zenoss/develop' into develop