Merge branch 'stable-5.4'

* stable-5.4:
  Fix generation of surefire report during site generation

Change-Id: I2054dc67fc001910b66f395200c6796d4cef8ef3

pom.xml

@@ -619,7 +619,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>${maven-surefire-version}</version>
+        <version>${maven-surefire-report-plugin-version}</version>
         <configuration>
           <aggregate>true</aggregate>
           <alwaysGenerateSurefireReport>false</alwaysGenerateSurefireReport>