Correct osgi imports for api project
Fix concurrent modification exception