Branch next

Tag:V7-dev.18

Merge Highlights

* uid2grp: Fix LTTNG format string

Signed-off-by: Frank S. Filz <ffilzlnx@mindspring.com>

Contents:

2a9f210b0 Frank S. Filz V7-dev.18

6154a4c03 Lior Suliman uid2grp: Fix LTTNG format string