Ensure vouchers are moved to new basket when merging

This solves an issue where a customer's voucher is dropped when they
sign in.

Fixes #1187