Fix errors importing main and branch_9x into eclipse

When creating an eclipse project using the eclipse gradle target, the resulting project has errors. One is because there is a duplicate class name, the others are having package-info.java in the test code tree in addition to the main code tree for the same package.

The patch I will attach fixes the errors. There are thousands of warnings, something for another issue.