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