Merge "Bug 7172 - Correct error-info for missing-attribute errors"