Add handling to automatically group imports for per-file patches

[Machine-Maker]

We should be able to just use imports as normal for per-file diff. It would be useful however to group all the hunks created by adding imports together into one hunk when rebuilding patches instead of having to manually move the imports around and then get annoyed when your IDE reformats them accidentally.