Merge remote-tracking branch 'origin/bulk-app-translate' into product-app+bulk-app-translate

Conflicts:
	corehq/apps/app_manager/views.py
Merge branch 'product-app' into product-app+bulk-app-translate
Merge branch 'product-app' into product-app+bulk-app-translate
Merge remote-tracking branch 'origin/bulk-app-translate' into product-app+bulk-app-translate

Conflicts:
	corehq/apps/app_manager/views.py
Merge remote-tracking branch 'origin/double-management+case-detail-tabs' into autostaging
Merge remote-tracking branch 'origin/ptop-reindex' 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+edit-build-messages' into autostaging
Merge branch 'bulk-app-translate+logos' into autostaging
Merge remote-tracking branch 'origin/case-detail-tabs+share-fixtures' into autostaging
Merge branch 'hq-dropdown' into autostaging
Merge branch 'custom-data-choices' into autostaging
Merge remote-tracking branch 'origin/export-user' into autostaging
Merge remote-tracking branch 'origin/vellum-jquery-upgrade' into autostaging
Merge remote-tracking branch 'origin/vellum-staging' into autostaging
Merge branch 'product-app+bulk-app-translate' into autostaging
Merge branch 'custom_location_data' into autostaging