Merge "Deprecate $wgMasterWaitTimeout"