Design and Prototyping of New CERN Collimators in the Framework of the LHC Injector Upgrade (LIU) Project and the High-Luminosity (HL-LHC) Project