Merge branch 'stable-6.4' into stable-6.5

* stable-6.4:
  PackConfig: fix @since tags
  Remove unused API problem filters
  Add support for git config repack.packKeptObjects
  Do not exclude objects in locked packs from bitmap processing

Change-Id: I2951d01f5f4581bee20079508cd8ee6ca8554f1f

diff --cc Documentation/config-options.md
Simple merge

diff --cc org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
index c4b6bf955ed8a4370004dca77a818780c7a2976d,2b49f956ff40b2ffe4bac9661869834be2ae0108..7d6f40a51b04981523ebadee52bb1ab1b479e881
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
@@@ -828,13 -834,13 +834,20 @@@ public final class ConfigConstants 
         */
        public static final String CONFIG_KEY_WINDOW_MEMORY = "windowmemory";
  
 +      /**
 +       * the "pack.minBytesForObjSizeIndex" key
 +       *
 +       * @since 6.5
 +       */
 +      public static final String CONFIG_KEY_MIN_BYTES_OBJ_SIZE_INDEX = "minBytesForObjSizeIndex";
 +
+       /**
+        * The "repack.packKeptObjects" key
+        *
+        * @since 5.13.3
+        */
+       public static final String CONFIG_KEY_PACK_KEPT_OBJECTS = "packkeptobjects";
+ 
        /**
         * The "feature" section
         *

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
index a0c978f6ea328b7c6e7f333cbb69b8642076a1af,ff925dbe8de0b74d36c778561f29a24cdf87b06a..a8180d1d8d5a4602623f43171ffa40a32a979ff0
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
@@@ -36,10 -36,11 +36,12 @@@ import static org.eclipse.jgit.lib.Conf
  import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WAIT_PREVENT_RACYPACK;
  import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WINDOW;
  import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WINDOW_MEMORY;
 +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_MIN_BYTES_OBJ_SIZE_INDEX;
  import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_PACK_SECTION;
+ import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PACK_KEPT_OBJECTS;
  import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PRESERVE_OLD_PACKS;
  import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PRUNE_PRESERVED;
+ import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_REPACK_SECTION;
  
  import java.time.Duration;
  import java.util.concurrent.Executor;