This fixes a problem with author-in-text citations for references including both an author and an editor. Previously, both were included in the text, but only the author should be. Closes #6765. Added a test.
