port ZEN-14319
Merge pull request #509 from zenoss/feature/ZEN-14319

port ZEN-14319