Yeah, it is impossible to read this diff.
When this happens to me, I always visit the real file and I look at it there.

What we have here is four vectors instead of two.
1. broker with multitenant (/ngsi9 + /ngsi10 + /<tenant>/ngsi9 + /<tenant>/ngsi10
2. broker without multitenant  (/ngsi9 + /ngsi10)
3. confMan with multitenant (/ngsi9 +/<tenant>/ngsi)
4. confMan without multitenant (/ngsi9)