ISPN-4528 Genericize remaining M/R internal classes

Master only. See https://issues.jboss.org/browse/ISPN-4528 for more details. 
Maybe it should be investigated but right now we have to use non genericized version :-(