Merge pull request #23586 from eileenmcnaughton/import_mem

dev/core#3038 Fix handling for payment_instrument_id, cleanup financial_type_id

diff --cc CRM/Contribute/Import/Form/MapField.php
Simple merge

diff --cc CRM/Contribute/Import/Parser/Contribution.php
Simple merge

diff --cc CRM/Import/Parser.php
Simple merge