lttng: Drop changes after version update upstream

Upstream version has been updated to 2.5.0. This voids our 2.4.0  based changes.