Merge pull request #6059 from erikh/fix-tests

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

daemon/container.go

@@ -673,6 +673,8 @@ func (container *Container) Mount() error {
 }
 
 func (container *Container) Changes() ([]archive.Change, error) {
+	container.Lock()
+	defer container.Unlock()
 	return container.daemon.Changes(container)
 }