Merge remote-tracking branch 'origin/MAGETWO-51203' into MAGETWO-51824

Author: NadiyaS

app/code/Magento/Ui/view/base/web/js/modal/modal.js

@@ -221,8 +221,8 @@ define([
             this._createOverlay();
             this._setActive();
             this._setKeyListener();
-            this.modal.one(this.options.transitionEvent, _.bind(this._trigger, this, 'opened'));
             this.modal.one(this.options.transitionEvent, _.bind(this._setFocus, this, 'end', 'opened'));
+            this.modal.one(this.options.transitionEvent, _.bind(this._trigger, this, 'opened'));
             this.modal.addClass(this.options.modalVisibleClass);
 
             if (!this.options.transitionEvent) {

dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php

@@ -29,7 +29,6 @@ class ProductRepositoryTest extends WebapiAbstract
 
     protected function setUp()
     {
-        $this->markTestSkipped('Test skiped due to MAGETWO-46832');
         $this->testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
     }