Sync changes from upstream#54

jacobperron merged 3 commits intogalactic-develosrf/ros2_java:galactic-develfrom

jacob/sync_upstreamosrf/ros2_java:jacob/sync_upstreamCopy head branch name to clipboard