Merge branch 'pipeline-cleanup' into 'master'

Pipeline cleanup

See merge request osdu/platform/system/delivery!1
8 jobs for trusted-aws in 44 seconds (queued for 3 seconds)