ZEN-10128: ported ticket from ZEN-10330
Merge pull request #319 from zenoss/feature/ZEN-10128

ZEN-10128: ported ticket from ZEN-10330