Fixex ZEN-14546
Merge pull request #37 from zenoss/feature/ZEN-14546

Fixex ZEN-14546