Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-34652

Conflicts:
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

Author: sivaschenko

app/code/Magento/Bundle/Api/Data/LinkInterface.php

@@ -7,6 +7,10 @@
 
 namespace Magento\Bundle\Api\Data;
 
+/**
+ * Interface LinkInterface
+ * @api
+ */
 interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     const PRICE_TYPE_FIXED = 0;

app/code/Magento/Bundle/Api/Data/OptionInterface.php

@@ -7,6 +7,10 @@
 
 namespace Magento\Bundle\Api\Data;
 
+/**
+ * Interface OptionInterface
+ * @api
+ */
 interface OptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**

app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Bundle\Api\Data;
 
+/**
+ * Interface OptionTypeInterface
+ * @api
+ */
 interface OptionTypeInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**

app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Bundle\Api;
 
+/**
+ * Interface for Management of ProductLink
+ * @api
+ */
 interface ProductLinkManagementInterface
 {
     /**

app/code/Magento/Bundle/Api/ProductOptionRepositoryInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Bundle\Api;
 
+/**
+ * Interface ProductOptionRepositoryInterface
+ * @api
+ */
 interface ProductOptionRepositoryInterface
 {
     /**

app/code/Magento/Bundle/Api/ProductOptionTypeListInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Bundle\Api;
 
+/**
+ * Interface ProductOptionTypeListInterface
+ * @api
+ */
 interface ProductOptionTypeListInterface
 {
     /**

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php

@@ -110,9 +110,12 @@ public function getOptions()
      */
     public function isDisabledField()
     {
-        return $this->getProduct()->getId() &&
-            $this->getAttribute()->getAttributeCode() === 'price' ||
-            $this->getElement()->getReadonly();
+        return $this->_getData('is_disabled_field')
+            || ($this->getProduct()->getId()
+                && $this->getAttribute()->getAttributeCode() === 'price'
+            )
+            || $this->getElement()->getReadonly();
+
     }
 
     /**
@@ -142,7 +145,9 @@ public function getExtendedElement($switchAttributeCode)
                 'values' => $this->getOptions(),
                 'value' => $switchAttributeCode,
                 'class' => 'required-entry next-toinput',
-                'disabled' => $this->isDisabledField()
+                'no_span' => true,
+                'disabled' => $this->isDisabledField(),
+                'value' => $this->getProduct()->getData($switchAttributeCode),
             ]
         );
     }

app/code/Magento/Bundle/Pricing/Price/BundleOptionPriceInterface.php

@@ -7,6 +7,7 @@
 
 /**
  * Option price interface
+ * @api
  */
 interface BundleOptionPriceInterface
 {

app/code/Magento/Bundle/Pricing/Price/DiscountProviderInterface.php

@@ -8,6 +8,7 @@
 
 /**
  * Interface DiscountProviderInterface
+ * @api
  */
 interface DiscountProviderInterface
 {

app/code/Magento/Bundle/Pricing/Price/FinalPriceInterface.php

@@ -8,6 +8,7 @@
 
 /**
  * Interface FinalPriceInterface
+ * @api
  */
 interface FinalPriceInterface extends \Magento\Catalog\Pricing\Price\FinalPriceInterface
 {