Adjust for OSGi environment. Bump version to 0.2.2.1.