Updated implementation of collimator materials in SixTrack and MERLIN codes*