Fixes ZEN-15726
Merge pull request #285 from zenoss/feature/ZEN-15726

Fixes ZEN-15726