change bundle measure ids from nqf to cms and default to using hqmf_id (...

...cms_id == false)