[M] Change in osmo-hnbgw[master]: Split UPF into its own object