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

[TIMOB-17257](3_3_X)Updating how sessionID is setup.