Merge "Clean bashisms in jjb integration-set-variables.sh"