Merge "Make update.php and install.php use wfPHPVersionError() and reorganise it"