Fix the association between measure conditions and certificate

It should use both the certificate type and the code as the key.

There are cases where the codes are the same (for UK certificates) but the type differs

Fixes: https://www.pivotaltracker.com/story/show/55703024