Apply dd4hep single particle momentum patch to 1.18 as well

This will be fixed in anything after 1.18 since patch was included in dd4hep master as of Sept 20, 2021, but 1.18 was tagged earlier in Sept.