Adding handling of entity locations for shipto's

--HG--
extra : source : 35f065d3009d781516a8c4788a330cfb438e4ae8
Removing carp always

--HG--
extra : source : 16546a2643b94497a902a9027a5852cce00a1a02