Error using --no-core & --prepare-install

Fixed an issue where /tmp/make_tmp_[...]/__build__/sites/default/default.settings.php was not found using --no-core & --prepare-install.

And somehow another commit (not by me) is included here...