Fix for ZEN-9196
Merge pull request #237 from zenoss/feature/ZEN-9196

Fix for ZEN-9196