Merge "(bug 46615) updateCollation.php: sanity check the collation before proceeding"