Merge branch 'MTA-1821' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop

Author: Dmytro Aponasenko

dev/tests/functional/lib/Magento/Mtf/Client/Element/OptgroupselectElement.php

@@ -13,13 +13,6 @@
  */
 class OptgroupselectElement extends SelectElement
 {
-    /**
-     * Option locator.
-     *
-     * @var string
-     */
-    protected $optionByIndex = './/option';
-
     /**
      * Option group selector.
      *
@@ -44,14 +37,7 @@ public function getValue()
     {
         $this->eventManager->dispatchEvent(['get_value'], [(string)$this->getAbsoluteSelector()]);
 
-        $selectedLabel = '';
-        $labels = $this->getElements($this->optionByIndex, Locator::SELECTOR_XPATH);
-        foreach ($labels as $label) {
-            if ($label->isSelected()) {
-                $selectedLabel = $label->getText();
-                break;
-            }
-        }
+        $selectedLabel = parent::getValue();
         if ($selectedLabel == '') {
             throw new \Exception('Selected value has not been found in optgroup select.');
         }

dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectstoreElement.php

@@ -13,13 +13,6 @@
  */
 class SelectstoreElement extends SelectElement
 {
-    /**
-     * Option locator
-     *
-     * @var string
-     */
-    protected $optionByIndex = './/optgroup/option[%d]';
-
     /**
      * Store option group selector.
      *