Merge pull request #1179 from jbonofre/KARAF-6833

[KARAF-6833] Upgrade to Felix SCR 2.1.22