Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191

Author: Denys Rul

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml

@@ -89,6 +89,7 @@ require([
                         $('.page-actions').floatingHeader({
                             'title': '.category-edit-title'
                         });
+                        $('body').trigger('contentUpdated');
                         try {
                             if (refreshTree) {
                                 window.refreshTreeArea();

lib/web/mage/backend/validation.js

@@ -233,7 +233,9 @@
         'validate-downloadable-file': [
             function (v, element) {
                 var elmParent = $(element).parent(),
-                    linkType = elmParent.find('input[value="file"]');
+                    linkType = elmParent.find('input[value="file"]'),
+                    newFileContainer;
+
                 if (linkType.is(':checked') && (v === '' || v === '[]')) {
                     newFileContainer = elmParent.find('.new-file');
                     if (!alertAlreadyDisplayed && (newFileContainer.empty() || newFileContainer.is(':visible'))) {