Better error messages when importing orders (api)
Set up attributes for successful order import
Fix conflict after gem money 6.0.0 release

This would bring #2737 back but we need to be able to bundle and
activemerchant current release require money < 6.0.0