[Apiman-dev] Merge Karaf branch to Master