forward porting #3053#3064

SteveMacenski merged 2 commits intomainros-navigation/navigation2:mainfrom

3053_2ros-navigation/navigation2:3053_2Copy head branch name to clipboard