Bug 6725: (follow-up) Make patron duplicate matching flexible