Stage-2 e/g & tau clustering: port firmware changes