MAGETWO-34789: [UI] Upgrade Magento Application

- Resolved conflicts

Author: Bogdan Plieshka

app/design/adminhtml/Magento/backend/web/css/source/variables/_data-grid.less

@@ -37,3 +37,7 @@
 @data-grid-checkbox-cell-inner__padding-horizontal: 1.8rem;
 
 @data-grid-row-parent-marker__size: 1rem;
+
+@data-grid-td__dragging__opacity: 95%;
+@data-grid-dragging-copy__border-color: @color-blue-pure;
+@data-grid-dragging-copy__border: 1px solid @data-grid-dragging-copy__border-color;