cleanup container.stop

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Merge pull request #4753 from vieux/clean_container_stop

cleanup container.stop