vellum:a82649a5b02bfb9bd9cebe2fe7eb89c6c19f4b92
vellum:6ec9842
Merge branch 'master' into vellum-staging

Conflicts:
	corehq/apps/app_manager/static/app_manager/js/vellum/src/global-deps.js
	corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
Merge branch 'double-management+case-detail-tabs' into autostaging
Merge remote-tracking branch 'origin/historical-forms' into autostaging
Merge remote-tracking branch 'origin/subscription-no-contact-info' into autostaging
Merge remote-tracking branch 'origin/revert-4205-revert-3841-86347-2' into autostaging
Merge remote-tracking branch 'origin/masterlist-workflow' into autostaging
Merge branch 'bulk-app-translate' into autostaging
Merge branch 'case-detail-tabs+share-fixtures' into autostaging
Merge remote-tracking branch 'origin/share-fixtures' into autostaging
Merge branch 'hq-dropdown+locations-for-everyone' into autostaging
Merge remote-tracking branch 'origin/custom-data-choices' into autostaging
Merge branch 'vellum-staging' into autostaging
Merge remote-tracking branch 'origin/custom_location_data+locations-for-everyone' into autostaging
Merge remote-tracking branch 'origin/custom_location_data' into autostaging
Merge remote-tracking branch 'origin/ucr-auto-form' into autostaging
update submodule refs