Merge "Remove $wgDBClusterTimeout"