Merge remote-tracking branch 'remotes/origin/MAGETWO-98980' into owls-delivery

Author: danmooney2

app/code/Magento/Paypal/etc/frontend/di.xml

@@ -40,6 +40,7 @@
         <arguments>
             <argument name="secureUrlList" xsi:type="array">
                 <item name="paypal_billing" xsi:type="string">/paypal/billing/</item>
+                <item name="paypal_billing_agreement" xsi:type="string">/paypal/billing_agreement/</item>
                 <item name="paypal_bml" xsi:type="string">/paypal/bml/</item>
                 <item name="paypal_hostedpro" xsi:type="string">/paypal/hostedpro/</item>
                 <item name="paypal_ipn" xsi:type="string">/paypal/ipn/</item>

app/code/Magento/Vault/etc/frontend/di.xml

@@ -23,4 +23,11 @@
         <plugin name="ProcessPaymentVaultConfiguration" type="Magento\Vault\Plugin\PaymentVaultConfigurationProcess"/>
         <plugin name="ProcessPaymentConfiguration" disabled="true"/>
     </type>
+    <type name="Magento\Framework\Url\SecurityInfo">
+        <arguments>
+            <argument name="secureUrlList" xsi:type="array">
+                <item name="vault" xsi:type="string">/vault/</item>
+            </argument>
+        </arguments>
+    </type>
 </config>