Fixing more shipto issues

--HG--
extra : source : 4969338aa633dd474a81a4f3418746d491f5c6f8
fixing issues with grafted revision