Workaround for token mismatch error on server session timeout for config and http authentication types

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Use a separate flag to avoid confusion

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Document what these flags do

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Merge pull request #1407 from madhuracj/tokenMismatch

Workaround for token mismatch error on server session timeout for config and http authentication types