hqmf_r2.1: Introduce support for GrouperCriteria in the generator