Don't error on bad schema, just retry
Organize import statements
bump submodule
Merge pull request #2037 from dimagi/schema_mismatch

Don't error on bad schema, just retry