ISPN-4528 Genericize remaining M/R internal classes

Master only. See https://issues.jboss.org/browse/ISPN-4528 for more details. 
No, the only limitation I found is with these. And you are right about the reason for the change! I'll follow your recommendations