port ZEN-14978
Merge pull request #494 from zenoss/feature/ZEN-14978

port ZEN-14978