L2SS-958: fix configdb conflicts

Closes L2SS-958

Merge request reports

Loading