Merge remote-tracking branch 'origin/MAGETWO-43942' into MAGETWO-MERGEFIX

Viktor Tymchynskyi · Viktor Tymchynskyi · commit e9b4cac0879e · 2015-10-15T12:30:40.000+03:00
diff --git a/app/code/Magento/Braintree/etc/frontend/di.xml b/app/code/Magento/Braintree/etc/frontend/di.xml
@@ -21,4 +21,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Url\SecurityInfo">
+        <arguments>
+            <argument name="secureUrlList" xsi:type="array">
+                <item name="braintree" xsi:type="string">/braintree/</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
