Merge remote-tracking branch 'upstream/develop' into MAGETWO-28383-restore-whitelist

app/code/Magento/Bundle/Model/Plugin/BundleLoadOptions.php

...e/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php

...o/Bundle/Test/Unit/Model/Plugin/BundleLoadOptionsTest.php

...alog/Api/Data/CategoryAttributeSearchResultsInterface.php

.../Magento/Catalog/Api/Data/ProductAttributeDataBuilder.php

...talog/Api/Data/ProductAttributeSearchResultsInterface.php

...agento/Catalog/Api/Data/ProductSearchResultsInterface.php

.../Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php

...de/Magento/Catalog/Model/Category/AttributeRepository.php

...de/Magento/Catalog/Model/Product/Attribute/Repository.php

...Magento/Catalog/Model/Product/Attribute/SetRepository.php

app/code/Magento/Catalog/Model/Product/Option/Converter.php

app/code/Magento/Catalog/Model/ProductRepository.php

...alog/Test/Unit/Model/Category/AttributeRepositoryTest.php

...alog/Test/Unit/Model/Product/Attribute/RepositoryTest.php

...g/Test/Unit/Model/Product/Attribute/SetRepositoryTest.php

...Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

app/code/Magento/Catalog/etc/di.xml

...og/view/base/templates/product/price/amount/default.phtml

...to/CatalogInventory/Api/Data/StockCollectionInterface.php