Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade

# Conflicts:
#	composer.lock
#   SwaggerWebapi/composer.json
#   SwaggerWebapiAsync/composer.json
#   WebapiAsync/composer.json

Author: Joan He

app/code/Magento/SwaggerWebapi/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "100.3.*",
         "magento/module-swagger": "100.3.*"
     },

app/code/Magento/SwaggerWebapiAsync/composer.json

@@ -5,9 +5,9 @@
         "sort-packages": true
     },
     "require": {
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "100.3.*",
-        "magento/module-swagger": "100.3.*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "magento/module-swagger": "100.3.*"
     },
     "suggest": {
         "magento/module-config": "100.3.*"

app/code/Magento/WebapiAsync/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "100.3.*",
         "magento/module-webapi": "100.3.*",
         "magento/module-asynchronous-operations": "100.3.*"