[Ogres] Sprint 25 Bug Fixes

Conflicts:
	setup/view/magento/setup/add-database.phtml

[UI] Sprint 32 & 33

[MPI] Refactor end-to-end functional 3rd party tests

- corrected namespace

[Troll & Folks] EAV Caching and integration tests coverage, bugfixes

- moved test and updated composer.lock

Conflicts:
	composer.lock
	dev/tools/Magento/Tools/View/deploy.php

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

Conflicts:
	app/code/Magento/Backend/Block/Page/Locale.php

- fixed functional tests

- fixed customer wait form

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

[South] Sprint 31&32: Zend_Locale & Zend_Date replacement

MAGETWO-29423: Incorrect tax amount (tax on full shipping) is refunded, when partial shipping amount is refunded

    - Move unit testcase

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

Conflicts:
	app/code/Magento/Email/composer.json
	app/code/Magento/User/composer.json

changes from Ievgen Shakhsuvarov
static test fixes
(cherry picked from commit ec03baa)

MAGETWO-33586: Shopping Cart is displayed partly broken if contains a Product with an image as a custom option

(cherry picked from commit 87f8a69)

Conflicts:
	app/code/Magento/Ui/composer.json
	composer.lock

Merge remote-tracking branch 'origin/FearlessKiwis-MAGETWO-18521-Incorrect-tax-calculation-with-discount2' into develop

- fixed functional tests

[Dragons] M2 GitHub Update (version 0.42.0-beta11) 

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

Conflicts:
	app/etc/di.xml
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

[Folks] Sprint 63 - Checkout on separate DB