Merge branch 'develop' into pr-mpi-bugfix-ce

# Conflicts:
#	app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php
#	app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
#	app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
#	app/code/Magento/Checkout/Model/Cart.php
#	app/code/Magento/Sales/Setup/InstallSchema.php
#	app/code/Magento/Sales/Setup/UpgradeSchema.php
#	app/code/Magento/Sales/etc/module.xml
#	app/code/Magento/Shipping/Model/Shipping.php
#	app/code/Magento/Vault/Model/PaymentTokenRepository.php
#	dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCancelSuccessMessageInShoppingCart.php
#	dev/tests/integration/testsuite/Magento/EncryptionKey/Model/ResourceModel/Key/ChangeTest.php
#	dev/tests/integration/testsuite/Magento/Vault/Model/PaymentTokenRepositoryTest.php