ZEN-5557 (round 2)

http://jira.zenoss.com/jira/browse/ZEN-5557