*Client: Add support for container ID files (a la pidfile) Upstream-commit: e59dd2c62c7ac94decf1d8d3391cbde56cb2a5b3 Component: engine