Merge branch 'stable-5.1' into stable-5.2

* stable-5.1:
  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

Change-Id: I741059a1d0d5950ab5bc16ec70352655ee926a24
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit/.settings/.api_filters
index 2a4fc54537c57ba9b512df92dd7c5457581d8e19,90341ad9d378fd671e432935b4c0e6156b6cea48..998c7cd79c02493d0384ace3649a2a6706240020
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -122,26 -114,20 +128,40 @@@
              </message_arguments>
          </filter>
      </resource>
 +    <resource path="src/org/eclipse/jgit/revwalk/DepthWalk.java" type="org.eclipse.jgit.revwalk.DepthWalk">
 +        <filter id="403804204">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
 +                <message_argument value="getDeepenNotFlag()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="404000815">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
 +                <message_argument value="getDeepenNots()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="404000815">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
 +                <message_argument value="getDeepenSince()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
+     <resource path="src/org/eclipse/jgit/storage/file/WindowCacheConfig.java" type="org.eclipse.jgit.storage.file.WindowCacheConfig">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="isPackedGitUseStrongRefs()"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="setPackedGitUseStrongRefs(boolean)"/>
+             </message_arguments>
+         </filter>
+     </resource>
      <resource path="src/org/eclipse/jgit/storage/file/WindowCacheStats.java" type="org.eclipse.jgit.storage.file.WindowCacheStats">
          <filter id="337809484">
              <message_arguments>

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