Issue #23758:correctly calc costs and margins for kits
Merge pull request #1538 from garyhgohoos/23758

23758:correctly calc costs and margins for kits