# Conflicts:
#	app/code/Magento/Catalog/Model/Category/DataProvider.php

[MPI] Bugfixes, updating Zephyr tickets id and ApiAnnotationTest removing

MAGETWO-60205: Prices are incorrect in SF for configurable product with tier-prices

MAGETWO-61132: Integration test Magento\Directory\Model\ObserverTest fails due to 3rd party service outage

Bugs
- MAGETWO-60908 Image role can't be updated
- MAGETWO-60299 Sample Data Test Failure: NavigateProductEntityTest

MAGETWO-61132: Integration test Magento\Directory\Model\ObserverTest fails due to 3rd party service outage

[Mavericks] Extend functional tests coverage

- merge commit

- merge commit

[Folks] Bugs

Fixed issues:
- MAGETWO-59053: [Github] Merge CSS Files causes entire site to load Extremely Slow #4321
- MAGETWO-59352: Variations and Constraints Review for automated functional tests in UI module

Issues fixed:

- MAGETWO-60283 Prices of configurable product are incorrectly recalculated when display currency is changed
- MAGETWO-53583 "Use Default" checkbox is checked again after saving empty fields (description, name, etc)
- MAGETWO-43911 [GITHUB] Untranslatable string
- MAGETWO-60127 [GITHUB] Number input fields have invalid 'maxlength' attribute #7125
- MAGETWO-60128 [GITHUB] Customer Addresses: Can't convert undefined to object #7115

- resolve merge conflicts

MAGETWO-53583: "Use Default" checkbox is checked again after saving empty fields (description, name, etc)

- add isolation for test