Add trait name to conflicting implementation error message

Closes #7907

This is my first pull request so let me know if I've done anything wrong.  I tried to pick off a nice easy one.