Cherry picked commits to make galactic release build#667

SteveMacenski merged 2 commits intogalacticcra-ros-pkg/robot_localization:galacticfrom

galactic_synccra-ros-pkg/robot_localization:galactic_syncCopy head branch name to clipboard