Include import name in import shadowing error messages.

This partially alleviates the confusing behavior in issue #16597