Merge branch '2.0.16-develop' of github.com:magento/magento2ce into MAGETWO-66604

Author: Sergey Shvets

app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml

@@ -65,6 +65,7 @@ var catalogWysiwygEditor = {
                 }
             });
         }
+        this.modal.modal("option", "firedElementId", elementId);
         this.modal.modal('openModal');
         $(elementId + '_editor').value = $(elementId).value;
     },

app/code/Magento/Customer/Controller/Account/EditPost.php

@@ -106,10 +106,7 @@ public function execute()
             } catch (InputException $e) {
                 $this->messageManager->addException($e, __('Invalid input'));
             } catch (\Exception $e) {
-                $message = __('We can\'t save the customer.')
-                    . $e->getMessage()
-                    . '<pre>' . $e->getTraceAsString() . '</pre>';
-                $this->messageManager->addException($e, $message);
+                $this->messageManager->addException($e, __('We can\'t save the customer.'));
             }
 
             if ($this->messageManager->getMessages()->getCount() > 0) {