Merge branch 'FearlessKiwis-MAGETWO-36387-Fixed-Price-Bundle-Discount' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop

Author: Robert He

app/code/Magento/Bundle/etc/di.xml

@@ -50,6 +50,7 @@
                 <item name="base_price" xsi:type="string">Magento\Catalog\Pricing\Price\BasePrice</item>
                 <item name="configured_price" xsi:type="string">Magento\Bundle\Pricing\Price\ConfiguredPrice</item>
                 <item name="bundle_option" xsi:type="string">Magento\Bundle\Pricing\Price\BundleOptionPrice</item>
+                <item name="catalog_rule_price" xsi:type="string">Magento\CatalogRule\Pricing\Price\CatalogRulePrice</item>
             </argument>
         </arguments>
     </virtualType>