BATCH-2229 & BATCH-2218: Removed OSGi related metadata and Maven POMs