Apply patch 07 from jboynes to improve cookie handling.
Simplify code that detects if we need to upgrade a cookie from V0 to V1
The patch should be safe since the logic is unchanged.


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