Merge branch 'MTA-1357' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop

Author: Dmytro Aponasenko

dev/tests/functional/.gitignore

@@ -8,4 +8,5 @@
 !/config/isolation.yml.dist
 !/config/server.yml.dist
 phpunit.xml
+credentials.xml
 /lib/Magento/Mtf/Util/Generate/testcase.xml

dev/tests/functional/credentials.xml.dist

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<replace xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/magento/mtf/Magento/Mtf/Fixture/InjectableFixture/etc/replace.xsd">
+
+    <field path="section/carriers_dhl_id/value" value="" />
+    <field path="section/carriers_dhl_password/value" value="" />
+    <field path="section/carriers_dhl_account/value" value="" />
+
+    <field path="section/carriers_fedex_account/value" value="" />
+    <field path="section/carriers_fedex_meter_number/value" value="" />
+    <field path="section/carriers_fedex_key/value" value="" />
+    <field path="section/carriers_fedex_password/value" value="" />
+
+    <field path="section/carriers_ups_password/value" value="" />
+    <field path="section/carriers_ups_username/value" value="" />
+    <field path="section/carriers_ups_access_license_number/value" value="" />
+    <field path="section/carriers_ups_shipper_number/value" value="" />
+
+    <field path="section/carriers_usps_userid/value" value="" />
+    <field path="section/carriers_usps_password/value" value="" />
+</replace>

dev/tests/functional/phpunit.xml.dist

@@ -44,6 +44,7 @@
         <env name="module_whitelist" value="Magento_Install" />
         <env name="report_file_name" value="test-cases-report.xml"/>
         <env name="basedir" value="var/log" />
+        <env name="credentials_file_path" value="./credentials.xml.dist" />
     </php>
 
 </phpunit>