Reuse the issues.Issue model in the diagnose collections.

Also tweak the template to use the same property for the state class.