Fix generating invalid trailing commas in import statements

[davidshepherd7]

Summary

Fixes #532

Test Plan

Unit tests added/tweaked for this case, also the remove imports codemod tests serve as an integration test.