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

# Conflicts:
#	composer.lock
#   Magento/StoreGraphQl/composer.json

Author: Joan He

app/code/Magento/StoreGraphQl/composer.json

@@ -3,7 +3,7 @@
     "description": "N/A",
     "type": "magento2-module",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "*"
     },
     "suggest": {