Merge remote-tracking branch 'origin/MAGETWO-40021' into MAGETWO-35251

Author: Valeriy Nayda

app/code/Magento/Catalog/view/adminhtml/web/product/product.css

@@ -280,13 +280,6 @@
     position: static;
 }
 
-/* Change Attribute Set */
-.admin__scope-old #product_info_tabs li.removed,
-.admin__scope-old div.removed,
-.admin__scope-old .field.removed {
-    display: none !important;
-}
-
 /*
     Custom Options
 -------------------------------------- */

app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less

@@ -10,3 +10,10 @@
         }
     }
 }
+
+/* Change Attribute Set */
+#product_info_tabs li.removed,
+div.removed,
+.field.removed {
+  display: none !important;
+}