MQE-1711: Switch between Developer mode and Production mode takes long time and the test end up time out

Resolved conflicts in ActionObject.

Author: soumyau

src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

@@ -72,7 +72,6 @@ class ActionObject
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\((?(?!}}).)+\)}})/';
     const STRING_PARAMETER_REGEX = "/'[^']+'/";
-    const DEFAULT_WAIT_TIMEOUT = 10;
     const DEFAULT_COMMAND_WAIT_TIMEOUT = 60;
     const ACTION_ATTRIBUTE_USERINPUT = 'userInput';
     const ACTION_TYPE_COMMENT = 'comment';