[TIMOB-17257]Updating how sessionID is setup.
Merge pull request #5879 from srahim/TIMOB-17257

[TIMOB-17257]Updating how sessionID is setup.