Merge "Revert "Add support for karaf.debug and karaf.keep.unpack""