MAGETWO-35610: Merge and Fix Tests

 - Additional code style changes to fix L3

app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php

@@ -95,7 +95,8 @@ class OrderSave
                         );
                     } catch (\Exception $e) {
                         throw new CouldNotSaveException(
-                            __('Could not add gift message to order\'s item: "%1"', $e->getMessage()), $e
+                            __('Could not add gift message to order\'s item: "%1"', $e->getMessage()),
+                            $e
                         );
                     }
                 }