Change check for default encode return
Change check for default encode return

Reintroduce encoding to account for instances not installed with UTF-8
support. Make the first check to see if the type of the command is in the list
of acceptable string types allowing us to pass it without changing it.

Change-Id: I9d1a40d5ea152180f8d2fe7ec780059fa7276b48

OSEHRA/VistA,josephsnyder/VistA,josephsnyder/VistA,josephsnyder/VistA,OSEHRA/VistA,OSEHRA/VistA,OSEHRA/VistA,josephsnyder/VistA,OSEHRA/VistA,josephsnyder/VistA,josephsnyder/VistA,OSEHRA/VistA