[WFLY-2735] Deal with non-existent MRR in inherited OSH's
Merge pull request #5779 from bstansberry/WFLY-2735

[WFLY-2735] Deal with non-existent MRR in inherited OSH's