Merge branch 'release/0.17' into 'GONRG-5851-cloud-sql-recreated-when-updating-0.16-to-master'

# Conflicts:
#   examples/simple_osdu/main.tf
#   examples/simple_osdu_onprem/custom-release.yaml
#   scripts-check.yml