Merge "[COMMON] Fix $BASH_SOURCE and pushd/popd bashisms"