Merge branch 'branch-6.2' into master

diff --cc server/sonar-server/src/main/java/org/sonar/server/authentication/BasicAuthenticator.java
Simple merge

diff --cc server/sonar-server/src/main/java/org/sonar/server/authentication/JwtCsrfVerifier.java
Simple merge

diff --cc server/sonar-server/src/main/java/org/sonar/server/authentication/RealmAuthenticator.java
Simple merge

diff --cc server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java
Simple merge