Only include dbsettings.inc.php from bootstrap file instead of settings.php, part of settings.php deprecation
Merge changes from @leechguy into refactor branche