Fixing more shipto issues

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

--HG--
extra : source : 3dec59cce7f6f1bf5d683c28649f3dfd2dcb2e4d
Merge pull request #280 from einhverfr/master

shipto fixes