Merge "Move debug log related settings up in Setup.php"