DDF-495 Added workaround for KARAF-1701