Merge branch 'master' into ros2_test

# Conflicts:
#	pom.xml
2 jobs for ros2_test in 2 minutes and 20 seconds
Status Name Job ID Coverage
  Windows
passed masterJobWindows #258333
Windows10

00:01:15

 
  Linux
passed BranchJobLinux #258334

00:01:04