Yeah, it is a little bit hard to understand this diff.
I always visit the "entire file" when this happens to me.

We have four vectors now, instead of two:
1. broker with tenants:      (/ngsi9  +  /ngsi10  +  /<tenant>/ngsi9  + /<tenant>/ngsi10
2. broker without tenants: (/ngsi9  +  /ngsi10)
3. confMan with tenants:   (/ngsi9  +  /<tenant>/ngsi9)
4. confMan without tenants: (/ngsi9)

The names of the vectors should give a hint.