Minor refactor/simplification
Merge branch 'master' into explicit_case_processing
Merge pull request #4182 from dimagi/new-static-refactor

Minor refactor/simplification
Merge remote-tracking branch 'origin/archive-products+explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/schedule' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge remote-tracking branch 'origin/refactor-domain-copy2' into autostaging
Merge remote-tracking branch 'origin/logos' into autostaging
Merge branch 'vellum-requirejs' into autostaging
Merge remote-tracking branch 'origin/admin-reports' into autostaging
Merge remote-tracking branch 'origin/archive-products+archive-to-deactivate' into autostaging
Merge remote-tracking branch 'origin/increase-es-timeout' into autostaging
Merge remote-tracking branch 'origin/parent-child-select-revised' into autostaging
Merge remote-tracking branch 'origin/custom-exports-better-ordering' into autostaging
Merge branch 'subscription-no-contact-info' into autostaging
update submodule refs