Fix conflicts in Mergify/bp/humble/pr 353

[Ryanf55]

This fixes conflicts for the backport to humble of #353.

Manual colcon test report ✔️

root@AutonomyML01:/ws# colcon test --packages-select launch_testing_ros --event-handlers=console_cohesion+
Starting >>> launch_testing_ros
--- output: launch_testing_ros                     
============================= test session starts ==============================
platform linux -- Python 3.10.12, pytest-6.2.5, py-1.10.0, pluggy-0.13.0
cachedir: /ws/build/launch_testing_ros/.pytest_cache
rootdir: /ws/launch_testing_ros, configfile: pytest.ini, testpaths: test
plugins: launch-testing-ros-0.19.6, ament-pep257-0.12.7, ament-copyright-0.12.7, ament-flake8-0.12.7, ament-lint-0.12.7, ament-xmllint-0.12.7, launch-testing-1.0.4, colcon-core-0.12.1
collecting ... 
collected 8 items                                                              

test/test_copyright.py .                                                 [ 12%]
test/test_flake8.py .                                                    [ 25%]
test/test_pep257.py .                                                    [ 37%]
test/examples/check_msgs_launch_test.py .                                [ 50%]
test/examples/check_node_launch_test.py .                                [ 62%]
test/examples/set_param_launch_test.py .                                 [ 75%]
test/examples/talker_listener_launch_test.py .                           [ 87%]
test/examples/wait_for_topic_launch_test.py .                            [100%]

=============================== warnings summary ===============================
test/test_flake8.py::test_flake8
test/test_flake8.py::test_flake8
  Warning: SelectableGroups dict interface is deprecated. Use select.

-- Docs: https://docs.pytest.org/en/stable/warnings.html
--------- generated xml file: /ws/build/launch_testing_ros/pytest.xml ----------
======================== 8 passed, 2 warnings in 18.83s ========================
---
--- stderr: launch_testing_ros

=============================== warnings summary ===============================
test/test_flake8.py::test_flake8
test/test_flake8.py::test_flake8
  Warning: SelectableGroups dict interface is deprecated. Use select.

-- Docs: https://docs.pytest.org/en/stable/warnings.html
---
Finished <<< launch_testing_ros [19.4s]

Summary: 1 package finished [19.5s]
  1 package had stderr output: launch_testing_ros