Merge branch '1.1.x' into 1.2.x

This involved a lot of conflicts and extra commits being dragged across due
to a rollup not being performed for quite some time.

* 1.1.x: (40 commits)
  Docs: fix a typo
  Change createdb docs example to use UTF8 encoding
  query parameter is optional in nodes endpoint (cherry picked from commit 22a974a6e9ba050f78eddab2ad12dbc8d6d9f1dd)
  (#21614) Include /v2 in metrics end-point examples
  Docs: fix a broken link (cherry picked from commit f9111b73c50a30ac0578b285ea2f4298faefa2ab)
  (#21548) Reports return a hash key not id
  Docs: Change canonical links to "latest" instead of 1.1
  Fix typo in kahadb troubleshooting doc and change title of FAQ
  [packaging] (#19326) terminus files conflict
  Docs: adjust formatting and flow of event and report endpoints
  Docs: fix formatting error on kahadb corruption page
  (#19239) Work around EOFException upon journal corruption
  Fix spelling in rspec test
  Raise Puppet::Error consistently in catalog indirector
  (#17842) Return meaningful errors with invalid resource references
  Define postgres settings using environment vars
  Backport remaining packaging fixes from master
  Fix else/end for suse in redhat spec
  Convert debian version to a string (rather than a symbol)
  Fix acceptance test version checking
  ...

Conflicts:
	Rakefile
	acceptance/helper.rb
	documentation/api/query/curl.markdown
	documentation/install_via_module.markdown
	documentation/puppetdb-faq.markdown
	documentation/trouble_kahadb_corruption.markdown
	ext/redhat/puppetdb.spec.erb
	ext/templates/deb/terminus.install.erb
	ext/test/build_packages_deb.sh
	tasks/install.rake
	tasks/template.rake
Merge branch '1.2.x' into 1.3.x

This merge contains a lot of conflicts and commits due to a rollup not being
performed for quite some time.

* 1.2.x: (53 commits)
  Docs: fix a typo
  Change createdb docs example to use UTF8 encoding
  Change createdb docs example to use UTF8 encoding
  query parameter is optional in nodes endpoint (cherry picked from commit 22a974a6e9ba050f78eddab2ad12dbc8d6d9f1dd)
  query parameter is optional in nodes endpoint (cherry picked from commit 22a974a6e9ba050f78eddab2ad12dbc8d6d9f1dd)
  (#21614) Include /v2 in metrics end-point examples
  (#21614) Include /v2 in metrics end-point examples
  Docs: fix a broken link (cherry picked from commit f9111b73c50a30ac0578b285ea2f4298faefa2ab)
  (#21548) Reports return a hash key not id
  (#21548) Reports return a hash key not id
  Docs: fix a broken link (cherry picked from commit f9111b73c50a30ac0578b285ea2f4298faefa2ab)
  Docs: Change canonical links to "latest" instead of 1.1
  Docs formatting: in release notes, make 1.2.0 header a header
  Docs: Be clearer about which users should use which installation path
  Fix typo in kahadb troubleshooting doc and change title of FAQ
  Create incoming dir *before* we need it in deb packaging
  Further wordsmith PE support
  Clarify wording about PE and PuppetDB 1.2
  Fix dangling colon in docs
  Remove references to Puppet Enterprise which isn't supported
  ...

Conflicts:
	documentation/api/commands.markdown
	documentation/api/index.markdown
	documentation/api/query/curl.markdown
	documentation/api/query/experimental/event.markdown
	documentation/api/query/experimental/report.markdown
	documentation/api/query/tutorial.markdown
	documentation/api/query/v1/facts.markdown
	documentation/api/query/v1/metrics.markdown
	documentation/api/query/v1/nodes.markdown
	documentation/api/query/v1/resources.markdown
	documentation/api/query/v1/status.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/wire_format/catalog_format.markdown
	documentation/api/wire_format/facts_format.markdown
	documentation/api/wire_format/report_format.markdown
	documentation/community_add_ons.markdown
	documentation/configure.markdown
	documentation/connect_puppet_apply.markdown
	documentation/connect_puppet_master.markdown
	documentation/index.markdown
	documentation/install_from_packages.markdown
	documentation/install_from_source.markdown
	documentation/install_via_module.markdown
	documentation/known_issues.markdown
	documentation/maintain_and_tune.markdown
	documentation/postgres_ssl.markdown
	documentation/puppetdb-faq.markdown
	documentation/release_notes.markdown
	documentation/repl.markdown
	documentation/scaling_recommendations.markdown
	documentation/trouble_kahadb_corruption.markdown
	documentation/upgrade.markdown
	documentation/using.markdown
Merge branch '1.3.x' into 1.4.x

This merge contains a lot of conflicts and commits, as there hasn't been a
rollup for quite some time.

* 1.3.x: (97 commits)
  Docs: fix a typo
  Fix spec tests to be compatible with puppet 3.3
  (maint) Fix tar task to allow spaces in path by wrapping the full path in quotes
  (packaging) For EL and Suse systems the pidfile will be in /var/run/$NAME/$NAME.pid
  (packaging) Suse doesn't need a special conditional to run the same command as the else block in puppetdb.spec.erb
  Modify Rakefile to support Ruby 2.0
  Revert "Merge pull request #565 from MosesMendoza/packaging/1.3.x/fix_template_for_suse"
  (packaging) Add suse init script to PuppetDB
  Whitespace fixup
  Making the buildroot doesn't need a special case on sles.
  Align fields in rpm spec
  (#21611) Allow rake commands to be ran on Ruby 2.0
  (Bug #21759) Update spec files to support Fedora 19
  Don't template nonexistent init script for suse
  Remove LGPL init script
  (maint) chkconfig does not exist on sles/suse so let's not depend on it.
  (maint) Move suse specific java requirements into the open_jdk macro
  (maint) Fix typo in puppetdb.spec
  Change createdb docs example to use UTF8 encoding
  Change createdb docs example to use UTF8 encoding
  ...

Conflicts:
	Rakefile
	acceptance/tests/import_export/import_export.rb
	acceptance/tests/import_export/legacy_storeconfigs_import_export.rb
	acceptance/tests/security/puppetdb-ssl-setup.rb
	documentation/api/query/v2/metrics.markdown
	documentation/release_notes.markdown
	tasks/template.rake
Merge branch '1.4.x'

This merge contains a lot of commits, as there hasn't been a rollup for quite
some time.

* 1.4.x: (97 commits)
  Docs: fix a typo
  Fix spec tests to be compatible with puppet 3.3
  (maint) Fix tar task to allow spaces in path by wrapping the full path in quotes
  (packaging) For EL and Suse systems the pidfile will be in /var/run/$NAME/$NAME.pid
  (packaging) Suse doesn't need a special conditional to run the same command as the else block in puppetdb.spec.erb
  Modify Rakefile to support Ruby 2.0
  Revert "Merge pull request #565 from MosesMendoza/packaging/1.3.x/fix_template_for_suse"
  (packaging) Add suse init script to PuppetDB
  Whitespace fixup
  Making the buildroot doesn't need a special case on sles.
  Align fields in rpm spec
  (#21611) Allow rake commands to be ran on Ruby 2.0
  (Bug #21759) Update spec files to support Fedora 19
  Don't template nonexistent init script for suse
  Remove LGPL init script
  (maint) chkconfig does not exist on sles/suse so let's not depend on it.
  (maint) Move suse specific java requirements into the open_jdk macro
  (maint) Fix typo in puppetdb.spec
  Change createdb docs example to use UTF8 encoding
  Change createdb docs example to use UTF8 encoding
  ...
Merge branch '1.4.x' into burgundy

This merge contains lots of commits, as this is the first rollup in a while.

* 1.4.x: (97 commits)
  Docs: fix a typo
  Fix spec tests to be compatible with puppet 3.3
  (maint) Fix tar task to allow spaces in path by wrapping the full path in quotes
  (packaging) For EL and Suse systems the pidfile will be in /var/run/$NAME/$NAME.pid
  (packaging) Suse doesn't need a special conditional to run the same command as the else block in puppetdb.spec.erb
  Modify Rakefile to support Ruby 2.0
  Revert "Merge pull request #565 from MosesMendoza/packaging/1.3.x/fix_template_for_suse"
  (packaging) Add suse init script to PuppetDB
  Whitespace fixup
  Making the buildroot doesn't need a special case on sles.
  Align fields in rpm spec
  (#21611) Allow rake commands to be ran on Ruby 2.0
  (Bug #21759) Update spec files to support Fedora 19
  Don't template nonexistent init script for suse
  Remove LGPL init script
  (maint) chkconfig does not exist on sles/suse so let's not depend on it.
  (maint) Move suse specific java requirements into the open_jdk macro
  (maint) Fix typo in puppetdb.spec
  Change createdb docs example to use UTF8 encoding
  Change createdb docs example to use UTF8 encoding
  ...
Merge branch 'burgundy'

This is really just to sync up burgundy with master, its a noop but aligns
the commits properly.

* burgundy:
Remove unused settings relating to queued commands

Some time ago, we did some investigatory work around the possibility
of queueing failed commands to disk on the master and trying to
re-send them to puppetdb later.  This work ended up being scrapped
due to complications relating to the unpredictable threading/process
model for the environments that the puppet master might be
deployed in.  However, it appears that we failed to remove one of
the configuration settings that had been added in support of that.
(maint) Remove legacy ssl-setup tests during upgrade

Previously we had put in a temporary test to ensure upgrades passed properly.
This patch removes those unnecessary tests now we have finally released.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #598 from kbarber/maint/1.4.x/remove_legacy_ssl-setup_tests_for_upgrade

(maint) Remove legacy ssl-setup tests during upgrade
Use file/line even during skipped events
Merge branch '1.4.x' into burgundy

* 1.4.x:
  (maint) Remove legacy ssl-setup tests during upgrade
Merge pull request #596 from cprice404/maint/burgundy/get-rid-of-unused-queued-command-settings

Remove unused settings relating to queued commands
Bump up report format in exporter
(PE-957) Filter out default "skipped" Schedule events

In versions of puppet prior to 3.3, every single agent run
will generate a swath of skipped Schedule events, which
are not useful and clutter up the reports data in PuppetDB.

This commit adds some "blacklist" functionality, whereby
certain well-known events can be filtered in the PuppetDB
report processor before being sent up to PuppetDB, so
they won't be stored.

There is a configuration option that can be used to
disable the blacklist, just in case these events are meaningful
to some set of end-users.

The blacklist is hard-coded for now and only contains the list
of skipped Schedule events that are well-known.
(PE-957) port `to_bool` logic over to match puppet's impl
Anonymize source file/line
Comment cleanup and add validation precondition
Event query endpoint file/line documentation
Merge pull request #600 from shakedown/dev/master/pe959-file-line-stuff

(PE-959) Store file/line information
Merge pull request #597 from cprice404/feature/burgundy/PE-957-filter-skipped-schedule-events

Feature/burgundy/pe 957 filter skipped schedule events