merge: Sync Apache Karaf subproject to github

 - Sync'ing branch from Apache Karaf upstream to master on
   github.com/evanchsa