Merge branch 'master' into 'gcp-update-obm'

# Conflicts:
#   pom.xml
9 jobs for trusted-gcp-update-obm in 5 minutes and 25 seconds (queued for 3 seconds)