Merge remote-tracking branch 'origin/MAGETWO-93066' into 2.2-develop-pr34

Author: DianaRusin

app/code/Magento/Checkout/view/frontend/web/js/view/cart/shipping-estimation.js

@@ -47,6 +47,12 @@ define(
                     checkoutDataResolver.resolveEstimationAddress();
                     address = quote.isVirtual() ? quote.billingAddress() : quote.shippingAddress();
 
+                    if (!address && quote.isVirtual()) {
+                        address = addressConverter.formAddressDataToQuoteAddress(
+                            checkoutData.getSelectedBillingAddress()
+                        );
+                    }
+
                     if (address) {
                         estimatedAddress = address.isEditable() ?
                             addressConverter.quoteAddressToFormAddressData(address) :