move ServerCookie to core
Merge remote-tracking branch 'upstream/master'
tomcat6
Merge pull request #859 from patriot1burke/master

tomcat6