Merge remote-tracking branch 'public/master' into publicChanges

# Conflicts:
#	TLS-Client-Scanner/pom.xml
#	TLS-Scanner-Core/pom.xml
#	TLS-Server-Scanner/pom.xml
#	TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/probe/PaddingOracleProbe.java
#	TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/report/result/PaddingOracleResult.java
#	pom.xml

Author: mmaehren

TLS-Scanner-Core/pom.xml

@@ -58,4 +58,4 @@
         <maven.compiler.target>11</maven.compiler.target>
         <main.basedir>${project.parent.basedir}</main.basedir>
     </properties>
-</project>
+</project>

TLS-Server-Scanner/pom.xml

@@ -76,4 +76,4 @@
         <maven.compiler.target>11</maven.compiler.target>
         <main.basedir>${project.parent.basedir}</main.basedir>
     </properties>
-</project>
+</project>

pom.xml

@@ -97,7 +97,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.60</version>
+            <version>1.64</version>
             <type>jar</type>
         </dependency>
         <dependency>