hqmf_r2.1: replace 'supplyReference' with 'criteriaReference' in templates.
hqml_r2.1: Move 'isCriterionInd' from child to attribute in template
Fix copy paste bug that caused generaton of 'criteriaReferenceReference'