Remvoing cp1021-cp1036 /cp1041-42 from puppet files

Change-Id: I39f1a5700f44bd6c205b95d5463037a81bab0cb3