ISPN-4528 Genericize remaining M/R internal classes

Master only. See https://issues.jboss.org/browse/ISPN-4528 for more details. 
@wburns I'd rather do a separate PR as this would be a massive change throughout the codebase needing a thorough review.