[#2037] Ensure cookies are unique

Last occurence win
Merge pull request #2041 from baloo/improvements/2037-withSessions

[#2037] Ensure cookies are unique
Merge remote-tracking branch: upstream/master