Fix name collision handling in restore
Fix name collision handling in restore

Signed-off-by: Tonis Tiigi <c2470c48b2d3312d61f94f18d3a1cd113d1915ad@gmail.com>
ndeloof/docker,SvenDowideit/docker,mkumatag/docker,kolyshkin/moby,nawawi/docker,yosifkit/docker,estesp/docker,amatsus/docker,charleszheng44/moby,mtesselH/docker,tklauser/docker,ffoysal/docker,moul/docker,yummypeng/docker,pramodhkp/moby,jvanz/docker,tklauser/docker,gjaskiewicz/moby,tophj-ibm/moby,PatrickLang/moby,dims/docker,srust/docker,dgageot/docker,pradipd/moby,mtrmac/docker,danyalKhaliq10p/moby,yongtang/docker,kojiromike/docker,tmp6154/docker,HideoYamauchi/docker,Mokolea/docker,sarnautov/moby,catinthesky/docker,kojiromike/docker,moul/docker,prertik/docker,JMesser81/docker,vdemeester/docker,thtanaka/docker,rremer/moby,mike1729/docker,paralin/docker,AkihiroSuda/docker,cpuguy83/docker,mkumatag/docker,rhatdan/docker,konstruktoid/docker-upstream,tonistiigi/docker,laijs/moby,kencochrane/docker,gnailuy/docker,crosbymichael/docker,erikstmartin/docker,SvenDowideit/docker,nawawi/docker,xuxinkun/docker,Ramzec/docker,ColinHebert/docker,jlhawn/docker,xuxinkun/docker,trebonian/docker,ndeloof/docker,mikedougherty/docker,jimjag/docker,amatsus/docker,q384566678/docker,moul/docker,flavio/docker,Syntaxide/docker,yasiramin10p/moby,KingEmet/docker,Ramzec/docker,tophj-ibm/docker,dgageot/docker,yosifkit/docker,liaoqingwei/docker,mikebrow/docker,ffoysal/docker,haveatry/docker,mahak/docker,mstanleyjones/docker,miminar/docker,yongtang/docker,coreos/docker,noironetworks/docker,AkihiroSuda/docker,michael-holzheu/docker,flavio/docker,mtrmac/docker,gnailuy/docker,mixja/docker,JMesser81/docker,cpuguy83/docker,gnailuy/docker,shishir-a412ed/docker,jthelin/docker,x1022as/docker,resin-io/docker,YuPengZTE/docker,darrenstahlmsft/moby,paralin/docker,jameszhan/docker,allencloud/docker,charleszheng44/moby,konstruktoid/docker-1,docker/docker,djs55/docker,rancher/docker,jimjag/docker,moypray/docker,thaJeztah/docker,pradipd/moby,lixiaobing10051267/docker,x1022as/docker,kojiromike/docker,harche/docker,rhatdan/docker,hqhq/moby,ndeloof/docker,kencochrane/docker,nawawi/docker,resin-io/docker,liaoqingwei/docker,dmcgowan/docker,pramodhkp/moby,sterchelen/docker,q384566678/docker,msabansal/docker,laijs/docker,johnstep/moby-moby,hqhq/moby,whuwxl/docker,catinthesky/docker,fcrisciani/docker,mkumatag/docker,AkihiroSuda/docker,ibuildthecloud/docker,shishir-a412ed/docker,resin-io/docker,moypray/docker,rancher/docker,endophage/docker,nalind/docker,bonczj/moby-json-file-logger,dmcgowan/docker,harche/docker,raja-sami-10p/moby,alfred-landrum/docker,erikstmartin/docker,srust/docker,mstanleyjones/docker,amatsus/docker,erikstmartin/docker,madhanrm/docker,darrenstahlmsft/docker,Syntaxide/docker,kolyshkin/docker,jwhonce/docker,kolyshkin/moby,moby/moby,coolljt0725/docker,bearstech/moby,tianon/docker,dccurtis/docker,trebonian/docker,tklauser/docker,cyphar/docker,naveed-jamil-tenpearls/moby,jthelin/docker,mahak/docker,PatrickLang/moby,hqhq/moby,nalind/docker,noironetworks/docker,dsheets/moby,mtesselH/docker,estesp/docker,bearstech/moby,shishir-a412ed/docker,unclejack/docker,ibuildthecloud/docker,whuwxl/docker,crosbymichael/docker,raja-sami-10p/moby,Mokolea/docker,crosbymichael/docker,darrenstahlmsft/moby,unclejack/docker,jvanz/docker,mikedougherty/docker,msabansal/docker,cyphar/docker,maxamillion/docker,justincormack/docker,bonczj/moby-json-file-logger,dsheets/moby,erikh/docker,SvenDowideit/docker,kolyshkin/moby,coreos/docker,ColinHebert/docker,michael-holzheu/docker,laijs/docker,nawawi/docker,duglin/docker,lixiaobing10051267/docker,moby/moby,sdurrheimer/docker,shhsu/docker,qudongfang/docker,endophage/docker,paralin/docker,dims/docker,mahak/docker,michael-holzheu/docker,lixiaobing1/docker,Ramzec/docker,miminar/docker,alfred-landrum/docker,jlhawn/docker,dmcgowan/docker,gnailuy/docker,Mokolea/docker,shhsu/docker,flavio/docker,rremer/moby,thaJeztah/docker,naveed-jamil-tenpearls/moby,JMesser81/docker,jimjag/docker,stevvooe/docker,yasiramin10p/moby,cyphar/docker,mtrmac/docker,haveatry/docker,dsheets/moby,cpuguy83/docker,thaJeztah/docker,qudongfang/docker,catinthesky/docker,duglin/docker,moul/docker,darrenstahlmsft/moby,q384566678/docker,diogomonica/docker,tophj-ibm/moby,mikebrow/docker,justincormack/docker,dccurtis/docker,moby/moby,charleszheng44/moby,jvanz/docker,dims/docker,POLJM242/docker,coreos/docker,tmp6154/docker,liaoqingwei/docker,konstruktoid/docker-upstream,tianon/docker,ripcurld0/moby,duglin/docker,YuPengZTE/docker,ffoysal/docker,laijs/docker,dperny/docker,paralin/docker,mtesselH/docker,konstruktoid/docker-1,Mokolea/docker,justincormack/docker,POLJM242/docker,HideoYamauchi/docker,mixja/docker,vdemeester/docker,allencloud/docker,ibuildthecloud/docker,ibuildthecloud/docker,pramodhkp/moby,konstruktoid/docker-upstream,cpuguy83/docker,fcrisciani/docker,mixja/docker,gschaetz/moby,danyalKhaliq10p/moby,haveatry/docker,lixiaobing1/docker,estesp/docker,yummypeng/docker,dgageot/docker,PatrickLang/moby,docker/docker,moby/moby,bearstech/moby,djs55/docker,erikh/docker,KarthikNayak/docker,akira-baruah/docker,bonczj/moby-json-file-logger,xuxinkun/docker,laijs/moby,stevvooe/docker,dperny/docker,diogomonica/docker,darrenstahlmsft/docker,miminar/docker,dperny/docker,prertik/docker,trebonian/docker,KarthikNayak/docker,gjaskiewicz/moby,thtanaka/docker,ibuildthecloud/docker,jlhawn/docker,x1022as/docker,scotttlin/docker,scotttlin/docker,stevvooe/docker,yongtang/docker,johnstep/moby-moby,tophj-ibm/docker,docker/docker,madhanrm/docker,mike1729/docker,naveed-jamil-tenpearls/moby,YuPengZTE/docker,imkin/moby,mikedougherty/docker,maxamillion/docker,jameszhan/docker,ripcurld0/moby,sdurrheimer/docker,konstruktoid/docker-1,unclejack/docker,tonistiigi/docker,prertik/docker,madhanrm/docker,jameszhan/docker,mahak/docker,HideoYamauchi/docker,erikh/docker,jimjag/docker,trebonian/docker,yosifkit/docker,kolyshkin/docker,coolljt0725/docker,tonistiigi/docker,kencochrane/docker,KingEmet/docker,bearstech/moby,jwhonce/docker,darrenstahlmsft/docker,msabansal/docker,nalind/docker,KarthikNayak/docker,whuwxl/docker,Syntaxide/docker,scotttlin/docker,lixiaobing10051267/docker,sdurrheimer/docker,lixiaobing1/docker,qudongfang/docker,konstruktoid/docker-upstream,rhatdan/docker,sterchelen/docker,mstanleyjones/docker,rancher/docker,KingEmet/docker,thtanaka/docker,alfred-landrum/docker,laijs/moby,imkin/moby,johnstep/moby-moby,akira-baruah/docker,tmp6154/docker,moypray/docker,shhsu/docker,tophj-ibm/docker,gschaetz/moby,tophj-ibm/moby,danyalKhaliq10p/moby,imkin/moby,maxamillion/docker,yosifkit/docker,endophage/docker,flavio/docker,thaJeztah/docker,harche/docker,rremer/moby,pradipd/moby,noironetworks/docker,vdemeester/docker,sarnautov/moby,sterchelen/docker,mikebrow/docker,ripcurld0/moby,dccurtis/docker,yasiramin10p/moby,djs55/docker,ColinHebert/docker,yummypeng/docker,fcrisciani/docker,gjaskiewicz/moby,diogomonica/docker,Ramzec/docker,allencloud/docker,nalind/docker,jwhonce/docker,srust/docker,coolljt0725/docker,AkihiroSuda/docker,gschaetz/moby,raja-sami-10p/moby,mike1729/docker,sarnautov/moby