Merge branch '1.6.x' into 2.0.x

* 1.6.x:
  (docs) Port recent docs revisions to 1.6.x branch

Conflicts:
	documentation/api/query/v1/resources.markdown
	documentation/api/query/v2/fact-names.markdown
	documentation/api/query/v2/facts.markdown
	documentation/api/query/v2/metrics.markdown
	documentation/api/query/v2/nodes.markdown
	documentation/api/query/v2/operators.markdown
	documentation/api/query/v2/query.markdown
	documentation/api/query/v2/resources.markdown
	documentation/api/query/v3/catalogs.markdown
	documentation/api/query/v3/nodes.markdown
	documentation/api/query/v3/query.markdown
	documentation/api/wire_format/catalog_format_v1.markdown
	documentation/release_notes.markdown
(maint) Remove duplicate line after merge up

Signed-off-by: Ken Barber <ken@bob.sh>
Merge branch '2.0.x' into stable

* 2.0.x:
  (maint) Remove duplicate line after merge up

Conflicts:
	documentation/api/query/v3/catalogs.markdown
	documentation/api/wire_format/catalog_format_v1.markdown
Merge branch 'stable'

* stable:
  (maint) Remove duplicate line after merge up