fixing imports and classpaths for tycho build
Merge pull request #582 from berryma4/3.3.x

fixing imports and classpaths for tycho build