ENGCOM-2997: #4942 and bundle checkbox bug #15905

 - Merge Pull Request #15905 from JosephMaxwell/magento2:patch-2
 - Merged commits:
   1. c05ac4c
   2. 076bb60
   3. e35a9b1

Author: magento-engcom-team

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -185,6 +185,17 @@ public function getJsonConfig()
                 if ($configValue) {
                     $defaultValues[$optionId] = $configValue;
                 }
+                
+                $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
+                $selections = $options[$optionId]['selections'];
+                array_walk($selections, function (&$selection, $selectionId) use ($preConfiguredQtys) {
+                    if (is_array($preConfiguredQtys) && isset($preConfiguredQtys[$selectionId])) {
+                        $selection['qty'] = $preConfiguredQtys[$selectionId];
+                    } else if ((int)$preConfiguredQtys > 0) {
+                        $selection['qty'] = $preConfiguredQtys;
+                    }
+                });
+                $options[$optionId]['selections'] = $selections;
             }
             $position++;
         }

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -169,7 +169,9 @@ protected function _getSelectedOptions()
      */
     protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
     {
-        if ($selectionId && $option->getSelectionById($selectionId)) {
+        if (is_array($selectionId)) {
+            $this->_selectedOptions = $selectionId;
+        } else if ($selectionId && $option->getSelectionById($selectionId)) {
             $this->_selectedOptions = $selectionId;
         } elseif (!$option->getRequired()) {
             $this->_selectedOptions = 'None';