MAGETWO-67024: Sorting by price ignores Catalog Price Rule for Simple product with required custom option

Author: svitja

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php

@@ -471,7 +471,7 @@ protected function _prepareTierPriceIndex($entityIds = null)
      *
      * @return  void
      */
-    private function applyBundlePrice() : void
+    private function applyBundlePrice(): void
     {
         $select = $this->getConnection()->select();
         $select->from(
@@ -499,7 +499,7 @@ private function applyBundlePrice() : void
      *
      * @return void
      */
-    private function applyBundleOptionPrice() : void
+    private function applyBundleOptionPrice(): void
     {
         $connection = $this->getConnection();
 
@@ -524,7 +524,7 @@ private function applyBundleOptionPrice() : void
         $select = $connection->select()->join(
             ['io' => $subSelect],
             'i.entity_id = io.entity_id AND i.customer_group_id = io.customer_group_id' .
-            ' AND i.website_id = io.website_id',
+                ' AND i.website_id = io.website_id',
             []
         )->columns(
             [

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php

@@ -71,7 +71,7 @@ class DefaultPrice extends AbstractIndexer implements PriceInterface
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param string|null $connectionName
-     * @param IndexTableStructureFactory $indexTableStructureFactory
+     * @param null|IndexTableStructureFactory $indexTableStructureFactory
      * @param PriceModifierInterface[] $priceModifiers
      */
     public function __construct(