Move even more stuff into dockerversion Upstream-commit: 619ad8421611e774a851b7be81ba8ae0a31963a2 Component: engine