Updated conn params for security_token.
Merge branch 'backfill-sec-token' into develop
Fixes #1989, #1942.