Merge "updateCollation.php: sanity check the collation before proceeding"