Plus some edits as suggested by @jamtur01 Closes #3636 Signed-off-by: Doug Davis <dug@us.ibm.com> Upstream-commit: 0e82ab713b Component: cli
0e82ab713b