MAGETWO-95517: Add different types of products on the quote including gift card

Author: Stas Puga

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml

@@ -13,7 +13,6 @@
             <argument name="ProductAttribute"/>
         </arguments>
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}"
                    userInput="{{ProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>

app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml

@@ -65,15 +65,15 @@
         <data key="is_default">false</data>
         <data key="sort_order">0</data>
     </entity>
-    <entity name="productAttributeOption7" type="ProductAttributeOption">
+    <entity name="ProductAttributeOption7" type="ProductAttributeOption">
         <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
         <data key="label" unique="suffix">Green</data>
         <data key="is_default">false</data>
         <data key="sort_order">3</data>
         <requiredEntity type="StoreLabel">Option7Store0</requiredEntity>
         <requiredEntity type="StoreLabel">Option8Store1</requiredEntity>
     </entity>
-    <entity name="productAttributeOption8" type="ProductAttributeOption">
+    <entity name="ProductAttributeOption8" type="ProductAttributeOption">
         <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
         <data key="label" unique="suffix">Red</data>
         <data key="is_default">false</data>