Fix issue with sales_quote_payment copying return_address to order_payment