Merge "Remove deprecated variable usage from Maintenance.php"