Merge pull request #1196 from jbonofre/KARAF-6843

[KARAF-6843] Upgrade to Felix SCR 2.1.24