Prevent central server and distributed server cookies from interfering.
Merge pull request #537 from jamalex/prevent_cookie_overlap

Prevent central server and distributed server cookies from interfering.