Merge branch 'master' into logos

Conflicts:
	corehq/apps/app_manager/static/app_manager/json/commcare-settings-layout.yaml
Merge remote-tracking branch 'origin/archive-products+explicit_case_processing' into autostaging
Merge remote-tracking branch 'origin/explicit_case_processing' into autostaging
Merge branch 'master+schedule' 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
Merge branch 'admin-reports' into autostaging
Merge branch 'increase-es-timeout' into autostaging
Merge remote-tracking branch 'origin/archive-products' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging
Merge branch 'fix-timeout' into autostaging
Merge remote-tracking branch 'origin/custom_user_data' into autostaging
Merge remote-tracking branch 'lwyszomi/better_date_filters_improvment' into autostaging
Merge branch 'master+uservoice-pending-invitations' into autostaging
Merge remote-tracking branch 'origin/revert-4205-revert-3841-86347-2' into autostaging
Merge remote-tracking branch 'origin/bulk-app-translate' into autostaging
Merge remote-tracking branch 'origin/callcenter' into autostaging
Merge remote-tracking branch 'origin/fixture-prop' into autostaging