[snipmatch] Bug 446250: Incorrect/unclear labels and inconsistencies

Change-Id: I53a3e9a36da34731ba3938be473c6baae9666ace
Signed-off-by: Johannes Dorn <johannes.dorn@codetrails.com>
Signed-off-by: Andreas Sewe <andreas.sewe@codetrails.com>
Merge "[snipmatch] Bug 446250: Incorrect/unclear labels and inconsistencies"