Fixed minor typos with trove-client help info

Fixed typos and cleaned up unnecessary imports.

Fixes bug 1238325

Change-Id: I7b2379cecb89e9f58cde9b2b68bddee41aefcfa3
Removed underscores from the end of some variables

Change-Id: Iff664cef5ec580de6a33db1503a6e567701418a3