Changes for supporting guest_token cookie.

This is dependent on https://github.com/spree/spree/pull/4816

/cc @huoxito @simmsy