[L] Change in osmo-pcu[master]: ms: Merge ms_storage into bts.cpp