Merge remote-tracking branch 'origin/MAGETWO-54044' into PR-P1

Author: kandy

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -542,7 +542,10 @@ define([
          */
         _OnChange: function ($this, $widget) {
             var $parent = $this.parents('.' + $widget.options.classes.attributeClass),
-                $input = $parent.find('.' + $widget.options.classes.attributeInput);
+                attributeId = $parent.attr('attribute-id'),
+                $input = $widget.productForm.find(
+                    '.' + $widget.options.classes.attributeInput + '[name="super_attribute[' + attributeId + ']"]'
+                );
 
             if ($this.val() > 0) {
                 $parent.attr('option-selected', $this.val());