Merged from trunk rev.14096

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side.h
Simple merge

diff --cc src/http.cc
Simple merge