Update HltDAQ to version v4r25p1 from Phys/stripping21-patches

Update to version that was used for S21r{0,1}p1, from Phys/stripping21-patches

@erodrigu @cvazquez FYI. If this is successful I will make a corresponding MR to remove the version in Phys