Merge remote-tracking branch 'tango-ce/MAGETWO-33814' into MAGETWO-33812

Conflicts:
	app/code/Magento/Customer/Model/AccountManagement.php
	app/code/Magento/Customer/Model/Resource/Customer.php

Author: Yuri Kovsher

dev/tests/integration/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php

@@ -66,8 +66,8 @@ public function testSave()
 
     /**
      * @magentoDbIsolation enabled
-     * @expectedException \Magento\Framework\Exception\InputException
-     * @expectedExceptionMessage A class with the same name already exists for ClassType PRODUCT.
+     * @expectedException \Magento\Framework\Exception\AlreadyExistsException
+     * @expectedExceptionMessage Class name and class type already exists.
      */
     public function testSaveThrowsExceptionIfGivenTaxClassNameIsNotUnique()
     {

lib/internal/Magento/Framework/Exception/Customer/Exception.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Exception\Customer;
+
+use Magento\Framework\Exception\LocalizedException;
+
+class Exception extends LocalizedException
+{
+}