Merge branch 'stable-5.5' into stable-5.6

* stable-5.5:
  Use FileSnapshot without using configs for FileBasedConfig

Change-Id: If904289feecd1e0d8466c1fb998f160f14d54b61

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
index 78262e977366875b7428bf9df00a659587f4be1f,eda4da8e90a1b3e61d5af2b690d150091ab3f177..d06b5a72d191e80d3ccf73eb9bfc00e432c7dbb0
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
@@@ -100,12 -133,10 +100,14 @@@ public class LockFile 
  
        private boolean needSnapshot;
  
 -      private boolean snapshotNoConfig;
 +      private boolean fsync;
 +
 +      private boolean isAppend;
  
 -      boolean fsync;
 +      private boolean written;
 +
++      private boolean snapshotNoConfig;
+ 
        private FileSnapshot commitSnapshot;
  
        private LockToken token;

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