Issue #3251625 by alexpott, Berdir: Including settings.php a second time and without same context can result in errors

(cherry picked from commit 773a2138)