Merge branch 'admin-styles-migration' of github.corp.ebay.com:magento-webdev/magento2ce into MAGETWO-34476

Author: Mykhailo Miroshnikov

app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml

@@ -9,7 +9,9 @@
  */
 ?>
 <div><p><?php echo __('The integration you selected asks you to approve access to the following:'); ?></p></div>
+<div class="admin__scope">
 <div id="integration-activate-permissions-tabs">
     <?php echo $block->getChildHtml('tabs'); ?>
 </div>
 <div id="integrations-activate-permissions-content"></div>
+</div>

app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml

@@ -176,7 +176,7 @@ require([
             taxRateFormElement.mage('form').mage('validation');
 
             taxRateForm.dialogRates({
-                title: '<?php echo __('Tax Rate1'); ?>',
+                title: '<?php echo __('Tax Rate'); ?>',
                 autoOpen: false,
                 id: '<?php echo $block->getJsId() ?>',
                 minWidth: 560,

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php

@@ -30,7 +30,7 @@ class Configure extends AbstractConfigureBlock
      *
      * @var string
      */
-    protected $okButton = '.ui-dialog-buttonset button:nth-of-type(2)';
+    protected $okButton = '.ui-button.action-primary';
 
     /**
      * Backend abstract block