servant branch is broken due to dependencies between different MRs

Compilation of simulation core fails with

/home/developer/repos/eclipse/sim/src/core/slave/modules/World_OSI/WorldDataQuery.cpp:1052:44: error: ‘const class OWL::Interfaces::Lane’ has no member named ‘GetOdId’; did you mean ‘GetId’?
1052 |                 const auto& laneId = lane->GetOdId();
      |                                      ~~~~~~^~~~~~~
      |                                      GetId
make[2]: *** [sim/src/core/slave/modules/World_OSI/CMakeFiles/World_OSI.dir/build.make:264: sim/src/core/slave/modules/World_OSI/CMakeFiles/World_OSI.dir/WorldDataQuery.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:4392: sim/src/core/slave/modules/World_OSI/CMakeFiles/World_OSI.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

and others.