Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MC-19926

� Conflicts:
�	composer.lock

Author: Oleksandr Gorkun

app/code/Magento/Elasticsearch/composer.json

@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
+        "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1"
     },
     "suggest": {
         "magento/module-config": "*"

app/code/Magento/Elasticsearch6/composer.json

@@ -9,7 +9,7 @@
         "magento/module-search": "*",
         "magento/module-store": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
+        "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1"
     },
     "suggest": {
         "magento/module-config": "*"

composer.json

@@ -34,21 +34,21 @@
         "colinmollenhour/credis": "1.10.0",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.6",
-        "elasticsearch/elasticsearch": "~2.0|~5.1|~6.1",
+        "elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
         "magento/composer": "~1.5.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.2",
         "monolog/monolog": "^1.17",
         "wikimedia/less.php": "~1.8.0",
         "paragonie/sodium_compat": "^1.6",
         "pelago/emogrifier": "^2.0.0",
-        "php-amqplib/php-amqplib": "~2.7.0|~2.10.0",
+        "php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "~3.8.0",
-        "symfony/console": "~4.1.0|~4.2.0|~4.3.0",
-        "symfony/event-dispatcher": "~4.1.0|~4.2.0|~4.3.0",
-        "symfony/process": "~4.1.0|~4.2.0|~4.3.0",
+        "symfony/console": "~4.1.0||~4.2.0||~4.3.0",
+        "symfony/event-dispatcher": "~4.1.0||~4.2.0||~4.3.0",
+        "symfony/process": "~4.1.0||~4.2.0||~4.3.0",
         "tedivm/jshrink": "~1.3.0",
         "tubalmartin/cssmin": "4.1.1",
         "webonyx/graphql-php": "^0.13.8",