[FABRIC-635] Fix diverging versions of org.apache.felix.utils