Modify OSGI patch to remove OSGI dependencies in server and web modules