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

ZEN-14514, ZEN-14515