Correctly OSGi-fy WARs