backport of:

http://svn.apache.org/viewvc?view=rev&rev=550519
http://svn.apache.org/viewvc?view=rev&rev=551099
http://svn.apache.org/viewvc?view=rev&rev=551126
http://svn.apache.org/viewvc?view=rev&rev=551935
http://svn.apache.org/viewvc?view=rev&rev=554892
Allow to use different values for sessionid in url encoded id
and cookies. (PR 41897)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@557993 13f79535-47bb-0310-9956-ffa450edef68