Merge "Reduce complexity of SiteSQLStore saveSites method"