merged trunk -r1424:1426 into 2.2.2-rc1: fixed missing default return from non-void function CQKeys::GetMatchId()
Authored by: mukau 2020-02-12
Parent: [r1426]
Child: [r1428]