ported from 4.2.4
Merge pull request #23 from zenoss/feature/ZEN-11023

ported from 4.2.4