Merge from trunk rev.14061

diff --cc src/adaptation/icap/ServiceRep.cc
Simple merge

diff --cc src/adaptation/icap/Xaction.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/errorpage.cc
Simple merge

diff --cc src/ssl/PeerConnector.cc
Simple merge

diff --cc src/tunnel.cc
Simple merge