Merge remote-tracking branch 'origin/MAGETWO-64959' into 2.1.8-develop-pr22

Author: ameysar

dev/tests/integration/testsuite/Magento/Framework/Search/_files/grouped_product.php

@@ -19,10 +19,10 @@
 $objectManager = Bootstrap::getObjectManager();
 
 /** @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository */
-$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
 $attribute = $attributeRepository->get('tax_class_id');
 $attribute->setIsFilterableInSearch(true);
-$attributeRepository->save($attribute);
+$attribute->save();
 
 /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
 $searchCriteriaBuilder = $objectManager->create(SearchCriteriaBuilder::class);