Preserve error on checkout original branch fail
Eliminate check_merges from rebuildstaging

It was mostly redundant with rebuild_staging, and rebuild_staging has been enhanced with the missing parts.
Don't filter by app_id if it's null
Fix undefined variable
update submodules
Only make one request for supply point cases
Merge pull request #4183 from dimagi/submit-history

Don't filter by app_id if it's null
Merge pull request #4185 from dimagi/location-export-performance

Only make one request for supply point cases
bump gunicorn max_requests to 600
Merge pull request #4186 from dimagi/max-requests

bump gunicorn max_requests to 600
Don't clear product data on upload

This fixes a bug that was likely introduced during the switch from csv
to excel
Improve output when there are merge conflicts
Merge pull request #4187 from dimagi/custom-product-data-bug

Don't clear product data on upload
Merge pull request #4171 from dimagi/remove-redundant-merge-checks

Remove redundant merge checks
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 branch 'logos' into autostaging