initial restructuring of CMR and BPR
Finish BPR calcs, plus DRY organization
Merge remote-tracking branch 'origin/master' into opm

Conflicts:
	custom/opm/opm_reports/filters.py
	custom/opm/opm_reports/reports.py
Merge branch 'master' into app-buttons
Merge pull request #3989 from dimagi/app-buttons

App buttons
Merge in ESQuery changes from emwf-refactor
Rewrite the get_rows method for CMR and BPR
update staging.yaml

[ci skip]
Merge remote-tracking branch 'origin/explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/auto-gps+schedule' into autostaging
Merge remote-tracking branch 'origin/auto-gps' into autostaging
Merge remote-tracking branch 'origin/es_none_type' into autostaging
Merge remote-tracking branch 'origin/hq-dropdown' into autostaging
Merge branch 'refactor-domain-copy2' into autostaging
Merge remote-tracking branch 'origin/logos' into autostaging
Merge remote-tracking branch 'origin/vellum-requirejs' into autostaging
Merge branch 'emwf-refactor' into autostaging
Merge remote-tracking branch 'origin/real-project-spaces' into autostaging
Merge remote-tracking branch 'origin/archive-to-deactivate' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging