Added selector1 and selector2 to array.

Removed addslashes, added replace of " to \" since " is read in a " via the xml parser.

(cherry picked from commit c7c7bc9)

Removed addslashes, added replace of " to \" since " is read in a " via the xml parser.
Rename wrapWithSingleQuotes to wrapWithDoubleQuotes, and fixed PHP Doc for the function.

(cherry picked from commit 1f81574)

…ti-stores

# Conflicts:
#	src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
#	src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
#	src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
#	src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
#	src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

…develop' into MQE-326-multi-stores

    # Conflicts:
    #       src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
    #       src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
    #       src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
    #       src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
    #       src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

* MQE-353

CAP changes, along with exception bugfix found in last spring demo.

* MQE-353 CR

Changed ternary to be included in parent if.

* MQE-292

Renamed locator to selector where applicable (schema, objects, and handlers).
Also removed locatorVariables element from schema, as it was deprecated by parameterized url/selector implementation.

* MQE-292

Codesniffer fixes.

…meters

- Added trim to parameter processing to prevent erroneous spaces.

…r Error

- Added waitForLoadingMaskToDisappear to di.xml

…t-develop

…magento2-functional-testing-framework into sprint-develop

…cution

    - change test schema for simpler persisted entity relationships
    - change data persistence handler to resolve entity relationships
    - change data schema to allow var declaration as a placehold for persisted data

…cution

- remove old entity test schema declarations

…) is inside $$ signs

- Updated Regex for persisted variable replacement.

…ates

- Edited di.xml to use Module instead of Mask for Pages/Sections.

- Changed selector resolution to call uniquenessFunctionCall. Solves issue with safe backwards compatibility.
- Generator was stripping ' from selector strings like: #'{{name}}', turning that into #{{name}} when resolved.

- di.xml update, turns out there's way more wrong here than just di.xml
- Changed CAP to append actiongroup Mergekey to steps when processing ActionGroups, otherwise the CAP would find duplicate keys and overwrite them (since the ActionGroup steps technically had the same keys).

…ing-framework into sprint-develop