Apply patch 06 from jboynes to improve cookie handling.
Remove duplicate code.
The patch should be safe since the logic is unchanged.


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