ISPN-4528 Genericize remaining M/R internal classes

Master only. See https://issues.jboss.org/browse/ISPN-4528 for more details. 
Not if you leave the others as rawtypes like they are. Only 1 additional file then.  And then the other PR can handle the rest.