updated config
Merge branch 'stable' of github.com:Dexels/custom-karaf into stable