fix broken cli path
Merge commit 'github/testing' into beta
remove spurious cli directory