Merge "Revert "Migrate to karaf4 for the local karaf distribution""