Fix token-related command line options
Fix token-related command line options

Aliasing --stoken to --token-secret is not effective because token_mode
does not get set.  Might as well just drop --stoken.

For --token-mode, change "stoken" to "rsa" to make the UI more intuitive:
liboath provides TOTP token support, and libstoken provides RSA token
support.

Signed-off-by: Kevin Cernekee <3105dbb3dd63fbb4f6371cfb04adc6726f76c56b@gmail.com>
Signed-off-by: David Woodhouse <b460d66aaf00c296a3db1c1d9eeafc081d5f7d70@intel.com>

brandt/openconnect,nmav/openconnect-mine,mtmiller/openconnect,mveplus/openconnect-client,liiir1985/openconnect,neshema/openconnect,atyndall/openconnect,lins05/openconnect,atyndall/openconnect,chadcatlett/openconnect,brandt/openconnect,mveplus/openconnect-client,liiir1985/openconnect,neshema/openconnect,nmav/openconnect-mine,chadcatlett/openconnect,cernekee/openconnect,mtmiller/openconnect,chadcatlett/openconnect,lins05/openconnect,matlockx/openconnect,matlockx/openconnect,lins05/openconnect,atyndall/openconnect,liiir1985/openconnect,mveplus/openconnect-client,mveplus/openconnect-client,brandt/openconnect,lins05/openconnect,mtmiller/openconnect,liiir1985/openconnect,brandt/openconnect,atyndall/openconnect,nmav/openconnect-mine,mtmiller/openconnect,cernekee/openconnect,don-johnny/openconnect,matlockx/openconnect,cernekee/openconnect,don-johnny/openconnect,neshema/openconnect,chadcatlett/openconnect,neshema/openconnect,matlockx/openconnect,cernekee/openconnect,don-johnny/openconnect,nmav/openconnect-mine,don-johnny/openconnect