First draft of consumption cache rework
WIP Refactoring
Finish consumption rework
Move code to make casexml tests happy
Merge branch 'master' into consumption-fix-again

Conflicts:
	submodules/casexml-src
Check if domain exists before getting settings
Update casexml
Merge pull request #2942 from dimagi/consumption-fix-again

Consumption fix again
Merge branch 'fields-to-filters' into autostaging
Merge branch 'attrib-fixture+fields-to-filters' into autostaging
Merge branch 'daily_form' into autostaging
Merge branch 'attrib-fixture' into autostaging
Merge branch 'vellum-includes' into autostaging
Merge branch 'cloudcare-resume' into autostaging
Merge branch 'multimedia-case-properties' into autostaging
Merge branch 'settings-redo+feature-preview' into autostaging
Merge branch 'phonelog-pillow-overwrite' into autostaging
update submodule refs