[Iron] Fix conflicts of 1661 backport #1736

christophfroehlich merged 2 commits intoros-controls:mergify/bp/iron/pr-1661ros-controls/ros2_control:mergify/bp/iron/pr-1661from

saikishor:fix/conflicts/mergify/bp/iron/pr-1661saikishor/ros2_control:fix/conflicts/mergify/bp/iron/pr-1661Copy head branch name to clipboard