Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-69556

Author: shiftedreality

app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml

@@ -8,7 +8,7 @@
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root">
         <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset" name="product.composite.fieldset">
-            <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options" template="Magento_Catalog::catalog/product/composite/fieldset/options.phtml">
+            <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options" name="product.composite.fieldset.options" template="Magento_Catalog::catalog/product/composite/fieldset/options.phtml">
                 <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="Magento_Catalog::catalog/product/composite/fieldset/options/type/default.phtml"/>
                 <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="Magento_Catalog::catalog/product/composite/fieldset/options/type/text.phtml"/>
                 <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="Magento_Catalog::catalog/product/composite/fieldset/options/type/file.phtml"/>

lib/web/mage/cookies.js

@@ -91,17 +91,18 @@
         this.get = function (name) {
             var arg = name + '=',
                 aLength = arg.length,
-                cLength = document.cookie.length,
+                cookie = document.cookie,
+                cLength = cookie.length,
                 i = 0,
                 j = 0;
 
             while (i < cLength) {
                 j = i + aLength;
 
-                if (document.cookie.substring(i, j) === arg) {
+                if (cookie.substring(i, j) === arg) {
                     return this.getCookieVal(j);
                 }
-                i = document.cookie.indexOf(' ', i) + 1;
+                i = cookie.indexOf(' ', i) + 1;
 
                 if (i === 0) {
                     break;
@@ -130,13 +131,14 @@
          * @return {String}
          */
         this.getCookieVal = function (offset) {
-            var endstr = document.cookie.indexOf(';', offset);
+            var cookie = document.cookie,
+                endstr = cookie.indexOf(';', offset);
 
             if (endstr === -1) {
-                endstr = document.cookie.length;
+                endstr = cookie.length;
             }
 
-            return decodeURIComponent(document.cookie.substring(offset, endstr));
+            return decodeURIComponent(cookie.substring(offset, endstr));
         };
 
         return this;

lib/web/mage/requirejs/mixins.js

@@ -115,7 +115,13 @@ define('mixins', [
          */
         getMixins: function (path) {
             var config = module.config() || {},
-                mixins = config[path] || {};
+            mixins;
+
+            // fix for when urlArgs is set
+            if (path.indexOf('?') !== -1) {
+                path = path.substring(0, path.indexOf('?'));
+            }
+            mixins = config[path] || {};
 
             return Object.keys(mixins).filter(function (mixin) {
                 return mixins[mixin] !== false;