Backported from rev. 1035121 (fix by Hans Bakker): removed hardcoded reference to "Company" (OFBIZ-4152)