t344 - Add gateway name as default map to Payment_Gateway__c
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa