Merge branch 'master'

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

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

diff --cc lttng-sessiond/ust-app.c
Simple merge

diff --cc lttng/commands/enable_events.c
Simple merge