MAGETWO-57963: The product page doesn't show all the fields for Product Details - for mainline

-- build fixes

Author: vnayda

lib/internal/Magento/Framework/EntityManager/Operation/Create.php

@@ -14,6 +14,7 @@
 use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Phrase;
 
 /**
  * Class Create
@@ -118,7 +119,7 @@ public function execute($entity, $arguments = [])
             $connection->commit();
         } catch (DuplicateException $e) {
             $connection->rollBack();
-            throw new AlreadyExistsException(__('Unique constraint violation found'), $e);
+            throw new AlreadyExistsException(new Phrase('Unique constraint violation found'), $e);
         } catch (\Exception $e) {
             $connection->rollBack();
             throw $e;

lib/internal/Magento/Framework/EntityManager/Operation/Update.php

@@ -14,6 +14,7 @@
 use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Phrase;
 
 /**
  * Class Update
@@ -117,7 +118,7 @@ public function execute($entity, $arguments = [])
             $connection->commit();
         } catch (DuplicateException $e) {
             $connection->rollBack();
-            throw new AlreadyExistsException(__('Unique constraint violation found'), $e);
+            throw new AlreadyExistsException(new Phrase('Unique constraint violation found'), $e);
         } catch (\Exception $e) {
             $connection->rollBack();
             throw $e;