🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #13020: [Backport to 2.1-develop] Attribute with "Catalog Input Type for Store Owner" equal "Fixed Product Tax" for Multi-store (by @dverkade)


Fixed GitHub Issues:
 - #12393: Attribute with "Catalog Input Type for Store Owner" equal "Fixed Product Tax" for Multi-store (reported by @klakovskiy) has been fixed in #13020 by @dverkade in 2.1-develop branch
   Related commits:
     1. 31c1939
     2. 2502f84

Author: Oleksii Korshenko

app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Manager/Website.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © 2013-2018 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Weee\Ui\DataProvider\Product\Form\Modifier\Manager;
@@ -67,11 +67,10 @@ public function getWebsites(ProductInterface $product, EavAttribute $eavAttribut
             return $this->websites = $websites;
         }
 
-
         if ($storeId = $this->locator->getStore()->getId()) {
             /** @var WebsiteInterface $website */
             $website = $this->storeManager->getStore($storeId)->getWebsite();
-            $websites[$website->getId()] = [
+            $websites[] = [
                 'value' => $website->getId(),
                 'label' => $this->formatLabel(
                     $website->getName(),
@@ -84,7 +83,7 @@ public function getWebsites(ProductInterface $product, EavAttribute $eavAttribut
                 if (!in_array($website->getId(), $product->getWebsiteIds())) {
                     continue;
                 }
-                $websites[$website->getId()] = [
+                $websites[] = [
                     'value' => $website->getId(),
                     'label' => $this->formatLabel(
                         $website->getName(),