Updates ZEN-9726
Merge pull request #248 from zenoss/feature/ZEN-9726

Updates ZEN-9726