Merge pull request #4067 from alexlarsson/fix-devmapper-race

Avoid extra mount/unmount during container registration