Move payment instrument lookup to the normalization method

This patch also makes it possible for a message to contain the
Payment Instrument, bypassing gateway/contribution_type lookup.

Change-Id: Iab2493f2dbc2d38835fb1c8d64e9af72b61e376a