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