Possible fix to setup_runtime.sh when $CDPATH is set
Merge branch 'fix-setup-cdpath'