minor: formatting, extending for ImportOrder that I found during #5279
minor: formatting, extending for ImportOrder that I found during #5279

romani/checkstyle,checkstyle/checkstyle,checkstyle/checkstyle,rnveach/checkstyle,romani/checkstyle,checkstyle/checkstyle,romani/checkstyle,jonmbake/checkstyle,rnveach/checkstyle,rnveach/checkstyle,romani/checkstyle,jonmbake/checkstyle,checkstyle/checkstyle,rnveach/checkstyle,checkstyle/checkstyle,checkstyle/checkstyle,jonmbake/checkstyle,romani/checkstyle,romani/checkstyle,rnveach/checkstyle,rnveach/checkstyle