Merge "Fix ShellCheck issues in jenkins-scripts"