Updated HQMF R2 generator and parser to align with the updated HQMF R2.1 spec
fixed issues with squashing hqmf_r2.1 branch