fixes ZEN-11030
Merge pull request #247 from zenoss/feature/ZEN-11030

fixes ZEN-11030
Merge pull request #246 from ssvsergeyev/develop

Fix for ZEn-15044
Updates ZEN-9726
Merge pull request #248 from zenoss/feature/ZEN-9726

Updates ZEN-9726
Bump revision to 2.2
Fixes ZEN-11511
Merge pull request #249 from zenoss/feature/ZEN-11511

Fixes ZEN-11511
ZEN-14514, ZEN-14515
Merge pull request #250 from zenoss/feature/ZEN-14514

ZEN-14514, ZEN-14515
Analytics: added labels to all components