CRM-16914 add payment_instrument_id field to payment processor type, payment processor