[S] Change in osmo-hnbgw[master]: cosmetic: regroup members of hnbgw_context_map