[BUGFIX] Allow argument with spaces in CLI shell commands (Revision 1)

Change-Id: I110aee25bd22e0625820f243ed4561b455a2c756
Revision-Id: fe8830a3a13b68d9dcbae5304ba8a34cb7fddf98