BUG:1336717
Do trap + forward the packet when the packet arrives from an ECMP source
that was different from the destination of the forward flow

[ forward port into mainline ]

Change-Id: If9283fde17f4353cd483b0f5b87100e82a4c8fca