Merge "Made SiteSQLStore use startAtomic() instead of DIY"