Fixes ZEN-15120
Merge pull request #40 from zenoss/feature/ZEN-15120

Fixes ZEN-15120