Merge commit '
cea87c3123c41bd06cd2b816f885a27612dfc356' into lttng-luna
Conflicts:
lttng/org.eclipse.linuxtools.ctf.core.tests/pom.xml
lttng/org.eclipse.linuxtools.ctf.core.tests/shared/org/eclipse/linuxtools/ctf/core/tests/shared/CtfTestTrace.java
lttng/org.eclipse.linuxtools.ctf.core.tests/traces/.gitignore
lttng/org.eclipse.linuxtools.ctf.core.tests/traces/get-traces.xml
lttng/org.eclipse.linuxtools.tmf.core.tests/shared/org/eclipse/linuxtools/tmf/core/tests/shared/CtfTmfTestTrace.java
Change-Id: Id7e995409cfeace1407abea1bd7c3c81f758ef22