port for ZEN-14977

see original ticket https://jira.zenoss.com/browse/ZEN-13860
changeset https://dev.zenoss.com/tracint/changeset/84313