Fixes ZEN-15633
Merge pull request #272 from zenoss/feature/ZEN-15633

Fixes ZEN-15633