Merge "Update $wgMainStash comments and merge in those from a deprecated ObjectCache...