DDF-812: Modified files to support Karaf 2.3.8