JMC-5698: Improving Duplicate Flags rule

[Joshua Matsuoka]

Hi Ken,

I've applied and taken a look at the changes and they look good!

Cheers,

- Josh

(Resending to list without the very long quoted message)