Analysis of diffs of server module shows r90277 and at least some of r90217 needs porting to trunk. Following files show diffs to 6.0.0.M1:
org/jboss/ejb/ContainerMBean
org/jboss/ejb/Container
org/jboss/invocation/InvocationStatistics
r90217 touches other files in other modules as well; I haven't looked at those.