GERONIMO-5519 match up the xid with the name during recovery. Add some more tracing. Merge from 2.1 branch rev 984273