MAGETWO-71414: Merge 2.2-develop into develop

- fix OfflineShipping/composer.json

Author: Igor Melnikov

app/code/Magento/OfflineShipping/composer.json

@@ -8,14 +8,14 @@
         "magento/module-backend": "100.3.*",
         "magento/module-shipping": "100.3.*",
         "magento/module-catalog": "101.2.*",
+        "magento/module-sales": "100.3.*",
         "magento/module-sales-rule": "100.3.*",
         "magento/module-directory": "100.3.*",
         "magento/module-quote": "100.3.*",
         "magento/framework": "100.3.*"
     },
     "suggest": {
         "magento/module-checkout": "100.3.*",
-        "magento/module-sales": "100.3.*",
         "magento/module-offline-shipping-sample-data": "Sample Data version:100.3.*"
     },
     "type": "magento2-module",