Bugfix/zen 12141

Pull https://github.com/zenoss/zenoss-prodbin/pull/182 into beta branch