[S] Change in osmo-upf[master]: always use specific PDR ids for access and core