Merge "use slave for row estimate in updateCollation.php"