Implemented FORGE-807

Existing tests all pass because the Forge commands generate explicit imports in Entity classes, so this doesn't get exercised. I'm not sure how to make a unit test that will prove this works, but have run all existing tests.