sync with latest apache/karaf