Make --help information consistent Upstream-commit: 70e47c4f75589e2ca46934b0f3c07b3ad87eb92d Component: engine