Include concurrent_schema_changes again for all branches