Merge "Make $wgDBerrorLogTZ actually default to $wgLocaltimezone"