Merge "Avoid "Transaction already in progress" errors in SiteStatsUpdate::doUpdate"