Merge branch 'stable-2.8' into stable-2.9

* stable-2.8:
  Add documentation of the index.threads setting
  Reformat index documentation

Conflicts:
	Documentation/config-gerrit.txt

Change-Id: I242cdb5c45748b83ce6dc85111d693c98c875ae2