BZ1172168: Fix match between subsystem key and related  subsystem token