port for ZEN-14977
Merge pull request #493 from zenoss/feature/ZEN-14977

port for ZEN-14977