Dictionary converstion, trace cleanup, and manifest annotations with customizable fields



Signed-off-by: Peter Kriens <peter.kriens@aqute.biz>