Merge "Make updateCollation wait for slaves every 500 (instead of 2000)"