Feature/zen 7923

forward port of zenoss-4.x for europa ZEN-7923:
  https://jira.zenoss.com/browse/ZEN-8111
  https://dev.zenoss.com/tracint/changeset/77603