Associate user in Order `merge!` when possible

Users might be losing their cart changes when they come back but don't
visit either the /cart page or the /checkout

Fixes #3742
Fixes #3736