Merge branch 'stable-4.11' into stable-5.0

* stable-4.11:
  Fix GC run in foreground to not use executor

Change-Id: I9bb1506805a2d5e79a420a1152bc45321c081229
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

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/internal/storage/file/GcLog.java
index c159a947058605f1e07c073897aeeb0b98ec9d61,82458c1acf6a37fedb4930b389c1c4977e4084cd..0e587ce8277616a4140be0a927ee219517fec9dc
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java
@@@ -43,9 -43,8 +43,8 @@@
  
  package org.eclipse.jgit.internal.storage.file;
  
 -import static java.nio.charset.StandardCharsets.UTF_8;
 +import static org.eclipse.jgit.lib.Constants.CHARSET;
  
- import java.io.BufferedReader;
  import java.io.File;
  import java.io.IOException;
  import java.nio.file.Files;