Conflicts:
	app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php

[Ogres] Bug-fixes

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

[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

- CR changes

[Nord] Sprint 22

- fixed randomly failed integration test

Merge remote-tracking branch 'origin/MAGETWO-38833-fix-error-messages-theme-uninstall' into PR_Branch

Conflicts:
	composer.lock

Merge remote-tracking branch 'origin/MAGETWO-38994-Eliminate-code-duplication-ComposerInformation' into PR_Branch

- CR changes

 [Mavericks] Add a wait to form element before filling a value and functional tests maintenance

[UI] MAGETWO-33536: M2 GitHub Update (version 0.74.0-beta14)