Merged from trunk

diff --cc src/Makefile.am
Simple merge

diff --cc src/adaptation/Config.cc
Simple merge

diff --cc src/adaptation/ServiceConfig.cc
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/client_side_reply.cc
Simple merge