Change in osmo-pcu[master]: Avoid moving DL-TBF from old_msg to new_ms during ms_merge