[S] Change in osmo-trx[master]: ms: fix shutdown issues