port ZEN-14978

original ticket https://jira.zenoss.com/browse/ZEN-13913
original changeset https://dev.zenoss.com/tracint/changeset/85273