Use proper scheme with static registry
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Cleanup existing controllers when cleanup fails mid-way.

Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
Merge pull request #5474 from crosbymichael/use-proper-scheme

Use proper scheme with static registry
Merge pull request #5476 from rjnagal/libcontainer-fixes

Cleanup cgroups on Set failures
#2112- Allow specifying a dockerfile with option --file

Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)