[M] Change in libosmo-sigtran[master]: cosmetic: osmo_ss7: Rearrange some contents