Updating fresh code from Core Karaf repo