Change in osmo-bsc[master]: Rearrange ctrl interface code