Merge remote-tracking branch 'origin/MAGETWO-55393' into pr-develop

# Conflicts:
#	app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less

Author: Karpenko, Oleksandr

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml

@@ -16,26 +16,28 @@
         </strong>
     </div>
     <div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
-        <fieldset class="fieldset">
-            <table class="admin__control-table" id="attribute-labels-table">
-                <thead>
-                <tr>
-                    <?php foreach ($block->getStores() as $_store): ?>
-                        <th class="col-store-view"><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
-                    <?php endforeach; ?>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <?php $_labels = $block->getLabelValues() ?>
-                    <?php foreach ($block->getStores() as $_store): ?>
-                        <td class="col-store-view">
-                            <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<?php echo $block->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($block->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
-                        </td>
-                    <?php endforeach; ?>
-                </tr>
-                </tbody>
-            </table>
+        <fieldset class="admin__fieldset fieldset">
+            <div class="admin__control-table-wrapper">
+                <table class="admin__control-table" id="attribute-labels-table">
+                    <thead>
+                    <tr>
+                        <?php foreach ($block->getStores() as $_store): ?>
+                            <th class="col-store-view"><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
+                        <?php endforeach; ?>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <?php $_labels = $block->getLabelValues() ?>
+                        <?php foreach ($block->getStores() as $_store): ?>
+                            <td class="col-store-view">
+                                <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<?php echo $block->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($block->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
+                            </td>
+                        <?php endforeach; ?>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
         </fieldset>
     </div>
 </div>

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

@@ -10,11 +10,11 @@
 
 $stores = $block->getStoresSortedBySortOrder();
 ?>
-<fieldset class="fieldset">
+<fieldset class="admin__fieldset fieldset">
     <legend class="legend">
         <span><?php echo $block->escapeHtml(__('Manage Options (Values of Your Attribute)')); ?></span>
-    </legend>
-    <div id="manage-options-panel" data-index="attribute_options_select_container">
+    </legend><br />
+    <div class="admin__control-table-wrapper" id="manage-options-panel" data-index="attribute_options_select_container">
         <table class="admin__control-table" data-index="attribute_options_select">
             <thead>
                 <tr id="attribute-options-table">

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml

@@ -10,9 +10,11 @@
 
 $stores = $block->getStoresSortedBySortOrder();
 ?>
-<fieldset class="fieldset">
-    <legend class="legend"><span><?php echo $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')); ?></span></legend>
-    <div id="swatch-visual-options-panel">
+<fieldset class="admin__fieldset fieldset">
+    <legend class="legend">
+        <span><?php echo $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')); ?></span>
+    </legend><br />
+    <div class="admin__control-table-wrapper" id="swatch-visual-options-panel">
         <table class="data-table clearfix" cellspacing="0">
             <thead>
             <tr id="swatch-visual-options-table">
@@ -116,5 +118,4 @@ $stores = $block->getStoresSortedBySortOrder();
             }
         }
     </script>
-
 </fieldset>

app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less

@@ -131,6 +131,7 @@
         &._required {
             span {
                 &:after {
+                    .lib-css(margin, @form-field-label-asterisk__margin);
                     color: @validation__color;
                     content: '*';
                 }

app/design/adminhtml/Magento/backend/web/css/styles-old.less

@@ -744,6 +744,7 @@
     //  --------------------------------------
 
     fieldset {
+        min-width: 0;
         padding: 20px;
     }
 
@@ -5049,6 +5050,10 @@
             }
         }
     }
+
+    .admin__control-table-wrapper {
+        clear: both;
+    }
 }
 
 .catalog-product-set-index {