Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Correct example of export command usage in documentation
  Gerrit 2.6

Conflicts:
	pom.xml

Change-Id: I26b5638ea396d97568bda4440552c314f2c37098
diff --git a/src/main/resources/Documentation/cmd-export.md b/src/main/resources/Documentation/cmd-export.md
index 0c06c7e..7f4351d 100644
--- a/src/main/resources/Documentation/cmd-export.md
+++ b/src/main/resources/Documentation/cmd-export.md
@@ -43,5 +43,5 @@
 To generate all review information:
 
 ```
-  $ java -jar gerrit.war ExportReviewNotes -d site_path --threads 16
+  $ ssh -p 29418 user@review reviewnotes export --threads 16
 ```