Merge "Fix shellcheck issues for integration scripts"