Fix ZEN-12772

https://jira.zenoss.com/browse/ZEN-12772