Manual sweep of !31164 (Add gas gap dependency to RpcHitIdHelper)

Hi,

since the automatic sweep of !31164 (merged) into 21.9 failed, this is the manual sweep.

Best, Nico