Test Trac #7963
Test Trac #7969
Remove .imports file which isn't part of the repo