Merge branch '2.1.x' into 2.2.x

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileEntries.java

@@ -370,7 +370,7 @@ class JarFileEntries implements CentralDirectoryVisitor, Iterable<JarEntry> {
 		int hashCode = AsciiBytes.hashCode(name);
 		int index = getFirstIndex(hashCode);
 		while (index >= 0 && index < this.size && this.hashCodes[index] == hashCode) {
-			CentralDirectoryFileHeader candidate = getEntry(index, CentralDirectoryFileHeader.class, false, null);
+			FileHeader candidate = getEntry(index, FileHeader.class, false, null);
 			if (candidate.hasName(name, NO_SUFFIX)) {
 				return index;
 			}