Fix merge conflicts into humble#2144

caio-freitas wants to merge 1 commit intoros-controls:mergify/bp/humble/pr-2009ros-controls/ros2_controllers:mergify/bp/humble/pr-2009from

caio-freitas:fix/humble/admittance_controller_test_with_invalid_robotcaio-freitas/ros2_controllers:fix/humble/admittance_controller_test_with_invalid_robotCopy head branch name to clipboard