Merge remote-tracking branch 'mainline/develop' into checkout

Conflicts:
	app/code/Magento/Captcha/etc/config.xml
	app/code/Magento/Checkout/Controller/Onepage/Index.php
	app/code/Magento/Checkout/view/frontend/web/template/authentication.html
	app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
	app/code/Magento/Checkout/view/frontend/web/template/progress.html
	app/code/Magento/Checkout/view/frontend/web/template/shipping-method.html
	app/code/Magento/Customer/view/frontend/web/js/customer-data.js
	app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-options.js
	app/code/Magento/Quote/Model/ShippingMethodManagement.php
	app/code/Magento/Shipping/view/frontend/layout/checkout_onepage_index.xml
	app/code/Magento/Weee/view/frontend/web/template/checkout/review/item/price/row_incl_tax.html
	app/code/Magento/Weee/view/frontend/web/template/checkout/review/item/price/unit_incl_tax.html
	app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_cart.less
	app/...