[XL] Change in osmocom-bb[master]: Migrate network identifier fields to modern osmocom structures