- admin related keys

- db-host
- db-name
- db-user
- db-password
- db-prefix
- db-model
- db_init_statements

- session-save
- definition-format

- backend-frontname

[MPI] Implement transparent redirect API

[FearlessKiwis] Support for Different Product Types in Catalog Product Data Object

Conflicts:
	app/code/Magento/CatalogInventory/etc/di.xml

[Extensibility] Bug fixes, public APIs, Sprint 50 

FearlessKiwis-MAGETWO-35688-FPT-Final-price-of-Simple-Product-isn-t-recalculated-after-selecting-options-on-product-page

- fix for product with multiple options, area type

    - Change data_objects.xml to service_data_attributes.xml

[API] Sprint 47 – Part 2

[Troll] Kpi build & bugfixes

Conflicts:
	app/code/Magento/Ui/etc/di.xml

[NORD] Bug fixes

Merge remote-tracking branch 'origin/MAGETWO-35850-Create-Update-Tools-To-Publish-Updater-App' into develop

FearlessKiwis-MAGETWO-35688-FPT-Final-price-of-Simple-Product-isn-t-recalculated-after-selecting-options-on-product-page

- bamboo pass by reference problem static
- Wee Observer integrity test fix

Conflicts:
	app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php

Conflicts:
	app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
	app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php

[MPI] Bugs

Merge branch 'MAGETWO-36326-updated' of github.corp.ebay.com:magento-troll/magento2ce into kpi-updated