ZEN-9726 updates
Merge pull request #34 from zenoss/feature/ZEN-9726

ZEN-9726 updates