Merge branch 'cherry-pick-0e470075' into 'release/0.4'

Cherry-pick MR69 to release/0.4 to fix ibm tests

See merge request osdu/platform/system/delivery!71
16 jobs for v0.4.2 in 46 minutes and 6 seconds (queued for 1 second)
latest