Fix/zen 12088

comments in jira tickets are helpful:
  https://jira.zenoss.com/browse/ZEN-12088