ZEN-15495
Merge pull request #259 from zenoss/feature/ZEN-15495

ZEN-15495