Merge "(bug 42600) (bug 24375) Fix doMaintenance.php exit procedures."