Fix race condition in CLI tests: diff was not acquiring a container lock

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Merge pull request #6059 from erikh/fix-tests

Fix race condition in CLI tests: diff was not acquiring a container lock