Add support for Dockerfile CMD options Upstream-commit: 9c32cd1cef6bd95d6f2a32d18756d6087ad8fa0c Component: engine