Merge branch 'stable-5.3' into stable-5.4

* stable-5.3:
  Fix string format parameter for invalidRefAdvertisementLine
  WindowCache: add metric for cached bytes per repository
  pgm daemon: fallback to user and system config if no config specified
  WindowCache: add option to use strong refs to reference ByteWindows
  Replace usage of ArrayIndexOutOfBoundsException in treewalk
  Add config constants for WindowCache configuration options

Change-Id: I12002dbfed9dff14fc6d2df9787d92eab5b1fa78

diff --cc org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
index 43826636aa6d2dff14efc7447dc248eadce5832d,f989d2e8bc327166795ed6484840cda9eb4b9d16..8b86c168845c2f1db6885a1e1ff0e9a519166c93
--- 1/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
--- 2/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java
@@@ -66,8 -69,10 +69,9 @@@ import org.eclipse.jgit.transport.Daemo
  import org.eclipse.jgit.transport.ReceivePack;
  import org.eclipse.jgit.transport.resolver.FileResolver;
  import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
 -import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
  import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
  import org.eclipse.jgit.util.FS;
+ import org.eclipse.jgit.util.SystemReader;
  import org.kohsuke.args4j.Argument;
  import org.kohsuke.args4j.Option;
  

diff --cc org.eclipse.jgit/.settings/.api_filters
Simple merge

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

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
Simple merge