Merge "Make $wgRevisionCacheExpiry default to one week"