cli/command/container: improve CID-file errors#6758

vvoland merged 2 commits intodocker:masterdocker/cli:masterfrom

thaJeztah:cidfile_errorthaJeztah/cli:cidfile_errorCopy head branch name to clipboard