Merge remote-tracking branch 'origin/MAGETWO-44496' into MPI-BUGFIXES

Author: Viktor Tymchynskyi

app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php

@@ -53,6 +53,7 @@ public function execute(EventObserver $observer)
             if ($agreement->isValid()) {
                 $message = __('Created billing agreement #%1.', $agreement->getReferenceId());
                 $order->addRelatedObject($agreement);
+                $agreement->addOrderRelation($order);
                 $this->checkoutSession->setLastBillingAgreementReferenceId($agreement->getReferenceId());
                 $agreementCreated = true;
             } else {

app/code/Magento/Paypal/Test/Unit/Observer/AddBillingAgreementToSessionObserverTest.php

@@ -122,6 +122,7 @@ public function testAddBillingAgreementToSession($isValid)
             )->will(
                 $this->returnValue('agreement reference id')
             );
+            $agreement->expects($this->once())->method('addOrderRelation')->with($order);
             $order->expects(new MethodInvokedAtIndex(0))->method('addRelatedObject')->with($agreement);
             $this->_checkoutSession->expects(
                 $this->once()

app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml

@@ -105,7 +105,7 @@ $relatedOrders = $block->getRelatedOrders();
                                     )); ?>
                                 </td>
                                 <td data-th="<?php echo $block->escapeHtml(__('Order Total')); ?>" class="col total">
-                                    <?php echo $block->escapeHtml($block->getOrderItemValue($order, 'order_total')); ?>
+                                    <?php /* @noEscape */ echo $block->getOrderItemValue($order, 'order_total'); ?>
                                 </td>
                                 <td data-th="<?php echo $block->escapeHtml(__('Order Status')); ?>" class="col status">
                                     <?php echo $block->escapeHtml($block->getOrderItemValue(