ZEN-10859: ported from ZEN-10878

port of https://dev.zenoss.com/tracint/changeset/80856