Merge branch 'master' into new-api-list-all

# Conflicts:
#	pom.xml
2 jobs for !31 with new-api-list-all in 7 minutes and 29 seconds (queued for 4 seconds)
detached
Status Job ID Name Coverage
  Review
passed #93222
osdu-small
trigger-trusted-tests

00:07:29

failed #93106
osdu-small
trigger-trusted-tests

00:00:37