Don't throw "restartmanager canceled" error for no restart policy container and add the container id to the warning message if a container has restart policy and has been canceled. Signed-off-by: Lei Jitang <leijitang@huawei.com> Upstream-commit: 494297baf8f391ce73cdc2e885a335a266261970 Component: engine