Merge "Use STRAIGHT_JOIN on updateCollation.php per jcrespo"