(PDB-595) Added docs for the load testing and benchmarking tool
(DOCUMENT-6) Update config page for PuppetDB module's improved settings behavior

The module manages settings like node-ttl now; the config page shouldn't
recommend managing them piecemeal anymore.
Fix command API Content-Type
Merge pull request #945 from dalen/doc_content_type

Fix command API Content-Type
Merge pull request #943 from nfagerlund/docs_module_update

(DOCUMENT-6) Update config page for PuppetDB module's improved settings ...
Merge pull request #941 from senior/ticket/master/pdb-595-benchmark-tool-docs

(PDB-595) Added docs for the load testing and benchmarking tool
Merge branch '1.6.x'

* 1.6.x:
  Fix command API Content-Type
  (DOCUMENT-6) Update config page for PuppetDB module's improved settings behavior
  (PDB-595) Added docs for the load testing and benchmarking tool

Conflicts:
	documentation/api/commands.markdown
	documentation/configure.markdown