Fix bug 1367: deviate SOL006 constituent-cpd-id list to use a compound key