Bug 22971 - add cross references between elements and attributes