Merge remote-tracking branch 'acme/perf/urgent' into perf/core

To have some 'perf probe' related fixes needed for further devel work in
this tool.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>