Merge "maintenance: Defer initilization of 'main' Config until after Setup.php runs"