Merge "Bug 7636: Karaf4 migration"