Merge branch 'FearlessKiwis-MAGETWO-39280-Set-Total-amount-in-checkout-flow-order' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Merge branch 'FearlessKiwis-MAGETWO-39281-Rename-hidden_tax-to-discount_tax_compensation-in-performance-toolkit' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Merge branch 'FearlessKiwis-MAGETWO-37948-order-tax-not-saved' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Merge branch 'FearlessKiwis-MAGETWO-35975-weee-caching' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Conflicts:
	app/code/Magento/Weee/composer.json

[UI] MAGETWO-33537: M2 GitHub Update (version 0.74.0-beta15)

[Extensibility] MAGETWO-36838 and Unit Test Coverage

Conflicts:
	app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php
	app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php

 - fixes from code review

Merge branch 'develop' into FearlessKiwis-MAGETWO-39281-Rename-hidden_tax-to-discount_tax_compensation-in-performance-toolkit

- changed the order of setTotals before we set service.setSelectedPaymentData and service.setSelectedPaymentInfo so subscribed observers would have the accurate totals

[Vanilla]   (MAGETWO-38867) Improved declaration of widgets with `mixins` node

Merged with failed (red) L1/REST EE build and  failed (red) FAT/CreateGroupedProductEntityTest build. Reffering to those fails are know isssue and also fails in current mainline.

    - Fix unit test failure

    - Fix static test errors

[Ogres] Bug-fixes

    - Added unit tests

Merge remote-tracking branch 'mainline/develop' into PR_Branch

Conflicts:
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

[Extensibility] Sprint 53 Stories and Bugs

- removed dev/tools/performance-toolkit/fixtures//orders.php because it got included on merge where that file isn't needed because of recent refactoring

 - fixes from code review

 - fixes from code review

 - fixes from code review

 - fixes from code review

 - fixes from code review

[WD] Update Content in Magento2 + Bugs

- Merge remote-tracking branch 'origin/develop' into PR

- Conflicts:
	- app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php
	- app/code/Magento/GiftMessage/view/frontend/web/template/item-level-gift-message.html
	- app/code/Magento/GiftMessage/view/frontend/web/template/order-level-gift-message.html
	- app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
	- dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateExistingCustomerFrontendEntity.php
	- dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php

[SOUTH] Shopping cart + Bugs

Conflicts:
	app/code/Magento/Checkout/composer.json
	app/code/Magento/Downloadable/composer.json

[Troll] Concurrency enhancements & bugfix