MAGETWO-94819: Swatch validation breaks the whole attribute form

- add jquery form validation event to restore options container

Author: cpartica

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

@@ -210,7 +210,7 @@ define([
             }
             tableBody = optionContainer.detach();
         });
-        editForm.on('afterValidate.error', function () {
+        editForm.on('afterValidate.error highlight.validate', function () {
             if (optionPanel.hasClass(activePanelClass)) {
                 optionPanel.find('table').append(tableBody);
                 jQuery('input[name="serialized_options"]').remove();

app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js

@@ -463,7 +463,7 @@ define([
                 tableBody = optionContainer.detach();
             });
 
-            editForm.on('afterValidate.error', function () {
+            editForm.on('afterValidate.error highlight.validate', function () {
                 if (activePanel.hasClass(activePanelClass)) {
                     activePanel.find('table').append(tableBody);
                     $('input[name="serialized_options"]').remove();