Merge branch 'azure/m10-master' into 'elhalper/fix-sdms-tests'

# Conflicts:
#   .gitlab-ci.yml
#   app/sdms/devops/osdu/cloud-providers/ibm.yml
6 jobs for !390 with elhalper/fix-sdms-tests in 16 minutes and 24 seconds (queued for 1 second)
latest merge request