Merge branch 'master' of git://git.lttng.org/lttng-tools

diff --cc configure.ac
Simple merge

diff --cc src/bin/lttng-sessiond/main.c
Simple merge

diff --cc src/common/consumer.c
Simple merge

diff --cc src/common/sessiond-comm/sessiond-comm.c
Simple merge

diff --cc src/common/sessiond-comm/sessiond-comm.h
Simple merge