Update CLI smoke to latest upstream updates

Be aware that this breaks compatibility with compose, at least for now.
Merge pull request #1498 from elyezer/fix-cli-smoke

Update CLI smoke to latest upstream updates