Upgrade ip-bom from 6.0.0.CR5 to 6.0.0.CR6 + throw away duplicate overwrites from ip-bom
(cherry picked from commit facdd8b4917b066f084e77c9039220403978d544)