Merge branch 'develop' into MAGETWO-33528

app/code/Magento/Customer/Model/Customer.php

app/code/Magento/Sales/Model/Order.php

...ales/Model/Order/Email/Sender/CreditmemoCommentSender.php

...gento/Sales/Model/Order/Email/Sender/CreditmemoSender.php

...o/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php

.../Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php

...nto/Sales/Model/Order/Email/Sender/OrderCommentSender.php

...de/Magento/Sales/Model/Order/Email/Sender/OrderSender.php

.../Sales/Model/Order/Email/Sender/ShipmentCommentSender.php

...Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php

...onal/tests/app/Magento/Ups/Test/Repository/ConfigData.xml

...ation/testsuite/Magento/ToolkitFramework/_files/small.xml

dev/tools/performance-toolkit/fixtures/cart_price_rules.php

...ools/performance-toolkit/fixtures/catalog_price_rules.php

dev/tools/performance-toolkit/fixtures/categories.php

dev/tools/performance-toolkit/fixtures/configs_apply.php

...ls/performance-toolkit/fixtures/configurable_products.php

dev/tools/performance-toolkit/fixtures/customers.php

dev/tools/performance-toolkit/fixtures/eav_variations.php

dev/tools/performance-toolkit/fixtures/orders.php