Apply patch 05 from jboynes to improve cookie handling.
Simplify logic for detecting cookie upgrades.
I made a few additional changes.
 - s/isnt/isNot/ in method names
 - whitespace clean-up
 - correct some comments
The patch should be safe since the logic is unchanged.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1596618 13f79535-47bb-0310-9956-ffa450edef68