Collimation System Upgrades for the High Luminosity Large Hadron Collider and Expected Cleaning Performance in Run 3