Merge branch 'MasterBugFixing' into 'BS-7189'
use HTTPOnly by default for the cookie
Merge branch 'MasterBugFixing' into BS-7189
Merge branch 'master' into 'MasterBugFixing'