Merge remote-tracking branch 'mainline/develop' into develop

Conflicts:
	dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php
	dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php
	dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/AssignProducts.php
	dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product.php
	dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/SimpleProduct.php
	dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php
	dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest/test.csv
	dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest/test.csv
	dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
	dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest/test.csv
	dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.php
	dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Handler/Curl/CreateConfigurable.php
	dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/scenario.xml
	dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/RegisterCustomerFrontendEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php
	dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.php
	dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ReAuthorizeTokensIntegrationEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/Review/Test/TestCase/CreateProductReviewFrontendEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest/test.csv
	dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest/test.csv
	dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/bat_ce.xml

Author: Dmytro Aponasenko

app/code/Magento/Review/view/frontend/templates/review.phtml

@@ -5,7 +5,7 @@
  */
 ?>
 
-<div id="product-review-container"></div>
+<div id="product-review-container" data-role="product-review"></div>
 <?php echo $block->getChildHtml(); ?>
 
 <script>
@@ -19,7 +19,7 @@
                 dataType: 'html'
             }).done(function (data) {
                 $('#product-review-container').html(data);
-                $('.pages a').each(function (index, element) {
+                $('[data-role="product-review"] .pages a').each(function (index, element) {
                     $(element).click(function (event) {
                         processReviews($(element).attr('href'), true);
                         event.preventDefault();

app/code/Magento/Webapi/Controller/Request.php

@@ -52,22 +52,4 @@ public function getCookie($name = null, $default = null)
     {
         return $this->_cookieReader->getCookie($name, $default);
     }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Added CGI environment support.
-     */
-    public function getHeader($header)
-    {
-        $headerValue = parent::getHeader($header);
-        if ($headerValue == false) {
-            /** Workaround for php-fpm environment */
-            $header = strtoupper(str_replace('-', '_', $header));
-            if (isset($_SERVER[$header]) && in_array($header, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
-                $headerValue = $_SERVER[$header];
-            }
-        }
-        return $headerValue;
-    }
 }

composer.json

@@ -29,7 +29,7 @@
         "zendframework/zend-serializer": "2.3.1",
         "zendframework/zend-log": "2.3.1",
         "zendframework/zend-http": "2.3.1",
-        "magento/zendframework1": "1.12.9-patch1",
+        "magento/zendframework1": "1.12.10",
         "composer/composer": "1.0.0-alpha8",
         "monolog/monolog": "1.11.0",
         "tubalmartin/cssmin": "2.4.8-p4"

composer.lock

@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc15",
+        "magento/mtf": "1.0.0-rc16",
         "php": "~5.5.0|~5.6.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",