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
tree: 405cb52a235e806e14baf9659f6a682d626024d2
  1. .gitignore
  2. .settings/
  3. LICENSE
  4. pom.xml
  5. src/