ZEN-7695
Merge pull request #217 from zenoss/feature/ZEN-7695

ZEN-7695