ACCUMULO-527 Add -zi and -zh options for shell.

Signed-off-by: Keith Turner <kturner@apache.org>
ACCUMULO-527 Fix indentation in Shell from last commit

Signed-off-by: Keith Turner <kturner@apache.org>
ACCUMULO-527 improved unit test