HSEARCH-1680 Upgrade Manifest definitions to satisfy OSGi/Karaf integration tests