Porting https://github.com/docker/docker/pull/12437
Porting https://github.com/docker/docker/pull/12437

Signed-off-by: Madhu Venugopal <d22477479bbf55ba62bd822f4112c80f292c7805@docker.com>

AkihiroSuda/docker,jimjag/docker,thaJeztah/docker,AkihiroSuda/docker,vdemeester/docker,mahak/docker,bearstech/moby,cpuguy83/docker,cpuguy83/docker,mahak/docker,yosifkit/docker,jimjag/docker,nawawi/docker,konstruktoid/docker-upstream,vdemeester/docker,moby/moby,gnailuy/docker,Mokolea/docker,nawawi/docker,paralin/docker,jameszhan/docker,yosifkit/docker,moby/moby,yosifkit/docker,AkihiroSuda/docker,nalind/docker,flavio/docker,flavio/docker,moul/docker,moul/docker,nalind/docker,bearstech/moby,cpuguy83/docker,trebonian/docker,docker/docker,docker/docker,Mokolea/docker,vdemeester/docker,Ramzec/docker,gnailuy/docker,jthelin/docker,Ramzec/docker,trebonian/docker,mahak/docker,mahak/docker,konstruktoid/docker-upstream,bearstech/moby,paralin/docker,djs55/docker,cpuguy83/docker,konstruktoid/docker-upstream,nalind/docker,djs55/docker,Mokolea/docker,trebonian/docker,trebonian/docker,nawawi/docker,konstruktoid/docker-upstream,AkihiroSuda/docker,jimjag/docker,docker/docker,nawawi/docker,Ramzec/docker,flavio/docker,jthelin/docker,thaJeztah/docker,moul/docker,paralin/docker,Ramzec/docker,moby/moby,thaJeztah/docker,moul/docker,paralin/docker,jameszhan/docker,Mokolea/docker,djs55/docker,jimjag/docker,moby/moby,gnailuy/docker,gnailuy/docker,flavio/docker,thaJeztah/docker,bearstech/moby,yosifkit/docker,nalind/docker,jameszhan/docker