Merge branch 'stable-5.10' into stable-5.11

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

Change-Id: Ie3f2d05aeb1aa04af707cfafef5780349be4d981

diff --cc org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileBasedConfigTest.java
index b8b503cdcd12e2192c6d334be35ae89bbec15c5a,1ccacd75e26ae54ee2199b073e23293fae26670f..7f0bfefbe7ba9637b80feaab27806761c9917f96
--- 1/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileBasedConfigTest.java
--- 2/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileBasedConfigTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileBasedConfigTest.java
@@@ -13,7 -13,7 +13,8 @@@ import static java.nio.charset.Standard
  import static org.eclipse.jgit.util.FileUtils.pathToString;
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertNotNull;
+ import static org.junit.Assert.assertFalse;
  
  import java.io.ByteArrayOutputStream;
  import java.io.IOException;