I have taken the naive approach and defer to the EjbJarMetaData attachment. But we might want to take a different merge approach. So the question is whether to apply the JBAS-5136.patch.
Yes, apply it. The AnnotationMetaDataDeployer can't wait for the merge as its output is input into the merge.