Issue #20003:changes to unitcost and margin for uom conversions