Make sure not to ship again on an unreturned expedited exchange

Conflicts:
	core/lib/tasks/exchanges.rake