update the cli / man page docs based on what is in master right now Upstream-commit: abc134677740803ea2e854ae0e87cfa4cfbd202a Component: engine