Preserve surrogates in CLI parser
Preserve surrogates in CLI parser

Change-Id: I9d6e37e807c76823d366f9700313948e93cd7f0a

flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast