Slightly stronger assertion during contrib amount normalization

Only copy original_amount/currency to gateway settled field as a
pair, never one without the other.

Change-Id: I9e4abae01a75145147737ac8c0022403b1ce4937