- Moved supplementary profile configuration files and updated references.

Merge pull request #481 from magento-jackalopes/MAGETWO-58017-github-error-creating-configurable-products

Fixed issue:

- MAGETWO-58017 [GITHUB] Error creating configurable products in 2.1.1 #6424

Merge remote-tracking branch 'upstream/develop' into MAGETWO-58017-github-error-creating-configurable-products

Issues fixed:

- MAGETWO-54026 Automate Move a Store View to Another Store on the Same Website
- MAGETWO-55418 Variations and Constraints Review for automated functional tests in Store module
- MAGETWO-58260 Automate Frontend Customer Change Email
- MAGETWO-58261 Automate Frontend Customer Change Password
- MAGETWO-58354 Automate Block Cache Exploit
- MAGETWO-59432 Add missing constraints severity for cms module
- MAGETWO-57719 Intermittent HTTP ERROR 500 during checkout

Merge remote-tracking branch 'upstream/develop' into MAGETWO-58017-github-error-creating-configurable-products

[Mavericks] Bug Fixes for Order Management functional automated tests

Fixed issue:
- MTA-3802: Wrong fail of Magento Health Index - CHI: Undefined offset in ClassScanner.php

MAGETWO-59144 [FT] Magento\ConfigurableProduct\Test\TestCase\CreateConfigurableProductEntityTest failed
MAGETWO-56052 MySQL triggers for Indexers not removed after upgrade from 2.0.7ce to 2.1ce
MAGETWO-59304 Test Magento\Test\Legacy\ModuleDBChangeTest:testModuleSetupFiles fails on developer branch
MAGETWO-56676 Related Products Target Rule not working

[Troll] MAGETWO-48786: Build for testing Upgrades from EE to B2B

MAGETWO-48786: Correct Semantic Version Check

Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-48786

Merge remote-tracking branch 'upstream/develop' into MAGETWO-58017-github-error-creating-configurable-products

Improving retrieving of the version

Improving retrieving of the version

Fixed Issue:

- MAGETWO-59105 Errors on storefront after install for MPAF builds.

# Conflicts:
#	dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
#	dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php

 - Merge remote-tracking branch 'mainline/develop' into MAGETWO-59105-SortOrder

[Falcons] Bug fixes for Composer, Cache, Catalog

 - Merge remote-tracking branch 'mainline/develop' into MAGETWO-59105-SortOrder

[South] Bug fixes
- MAGETWO-56529 Magento\Framework\Session\SaveHandlerTest test failed
- MAGETWO-55794 [FT] Product is not assigned to category
- MAGETWO-56370 [GITHUB] Broken File Type Custom Option #5434
- MAGETWO-59146 [Github] Disable email communication set to yes: email did get sent. #5988
- MAGETWO-56871 [GITHUB] Non-admin do not have permission to search for Categories in Cart Price Rules #6168

Fixed issues:

- MAGETWO-59089 [Github]Magento 2.1.1 Problem with change currency #6746

 - fix L4 failures