Merge branch 'KARAF-4644-master' of https://github.com/jwcarman/karaf