Issue with country of origin import

This pull request fixes the trade_shimpments import task that was wrongly importing the import country into the country_of_origin column.

It also removes the use of the Unknown Geo Entity in cases where some of the partners or country of origin are NULL. The legacy information should be kept as is.

Feel free not to run the import! :)