7196553: Review error messages for repeating annotations
Summary: Changes to the diagnostic messages to improve clarity and JLS coherence
Reviewed-by: jjg