Merge branch '2.0' into MDVA-126

Author: magento-services-vantiv-deploy

app/code/Magento/Catalog/i18n/en_US.csv

@@ -689,7 +689,7 @@ Storefront,Storefront
 "Special Price From Date","Special Price From Date"
 "Special Price To Date","Special Price To Date"
 Cost,Cost
-"Tier Price","Tier Price"
+"Tier Price","Customer Group Price"
 "Advanced Pricing","Advanced Pricing"
 Autosettings,Autosettings
 "Short Description","Short Description"