ISPN-4528 Genericize remaining M/R internal classes

Master only. See https://issues.jboss.org/browse/ISPN-4528 for more details. 
Because it would be a separate JIRA and PR and I want to have this PR merged in before beta :-)