Merge from trunk

diff --cc src/ICAP/ICAPModXact.h
Simple merge

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/client_side_request.cc
Simple merge

diff --cc src/client_side_request.h
Simple merge

diff --cc src/ftp.cc
Simple merge