Bug 22330: (QA follow-up) Remove duplicate use lines, combine and sort remaning lines