Branch cleanup in osmo-mgw.git