Merge branch 'develop' into MAGETWO-60453

Author: iivashchenko

app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml

@@ -40,9 +40,7 @@
 </div>
     <script>
         require(["Magento_Sales/order/create/form"], function(){
-        <?php if($_methodsCount == 1):?>
-            order.switchPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>');
-        <?php else: ?>
+        <?php if($_methodsCount != 1):?>
             order.setPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>');
         <?php endif; ?>
         });

lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php renamed to lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php

@@ -3,7 +3,7 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Test\Unit\ObjectManager\Config;
+namespace Magento\Framework\ObjectManager\Test\Unit\Config;
 
 use Magento\Framework\ObjectManager\Config\Compiled as CompiledConfig;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;