Merge "updateCollation.php: Improve --dry-run mode"