support for the address persist stuff. 

Only merge in 2-1-stable when https://github.com/spree/spree/pull/4028 is merged in spree 2-1-stable