Merge "Fix compilation warnings: replace deprecated org.apache.felix classes"