[M] Change in osmo-trx[master]: ms: restructure the va code to add rach support