(PDB-247) Fixes the namespace override warnings from schema

Schema 0.2.0 has not yet been released, but has the fix for PDB-247. I
made a pre-release (0.2.0-pre-1) of the current state of the branch and
updated PuppetDB to use it.  Some PuppetDB code also needed to change as
one of the protocols is changing in 0.2.0.
Merge pull request #789 from senior/ticket/master/pdb-247-fix-schema-warnings

(PDB-247) Fixes the namespace override warnings from schema
(PDB-254) Change benchmark to mutate catalog resources and edges send a defined number of messages

Previously benchmark.clj when it would mutate a catalog would only
add a single resource.  This change will add a new resource or
mutate a random existing resource.  It will also add a new or
change an existing edge.  One of these four mutations is picked
at random.  This commit also adds a new parameter to benchmark.clj
to allow the syncronous sending of a specified number of commands
(per host) via the -N argument
Fixed report submission part of benchmark to change the start/end time
and config version
Fix tk version string and test deps
Fix acceptance test race condition related to stop_puppetdb

Since trapperkeeper does a bit more thorough shutdown of all of
the various application components, it may now take PuppetDB
slightly longer to shut down when it receives a TERM signal.

This seems to be causing some race conditions in our acceptance
tests on particularly old/crusty boxes/OS's.  The "sleep_until_stopped"
method in our helper code only checks to see if the web server
is still responding before it returns; a more complete method
would be to actually make sure that the puppetdb PID has exited
before returning control to the tests.  This patch changes
the behavior of "sleep_until_stopped" accordingly.
Merge pull request #790 from cprice404/bug/master/race-condition-in-acceptance-tests

Fix acceptance test race condition related to stop_puppetdb
Merge pull request #784 from senior/ticket/master/pdb-254-benchmark-changes

(PDB-254) Change benchmark to mutate catalog resources and edges send a defined number of messages
Merge pull request #791 from cprice404/bug/master/fix-tk-test-dep-version

Fix tk version string and test deps
PDB-279 Sanitize report imports

Previously we had a bug PDB-85 that caused our exports on 1.5.x to fail. This
has been fixed, but alas people are trying to import those broken dumps into
1.6.x and finding it doesn't work.

This patch sanitizes our imports by only using select keys from the reports
model and dropping everything else.

Signed-off-by: Ken Barber <ken@bob.sh>
PDB-303 Utilise final version of prismatic/schema 0.2.0

Previously we were using our own published version of a pre 0.2.0 release, this
patch remedies that to now point at the upstream finalized version.

Signed-off-by: Ken Barber <ken@bob.sh>
PDB-279 Remove extraneous brackets from functions in ->

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #795 from kbarber/ticket/1.6.x/PDB-303-utilise-final-version-of-schema-020

PDB-303 Utilise final version of prismatic/schema 0.2.0
Merge pull request #794 from kbarber/ticket/1.6.x/PDB-279-import_from_15_fails

PDB-279 Sanitize report imports
PDB-299 Release notes for 1.6.0-rc2 changes

This covers the release notes for 1.6.0-rc2 plus a mention for
prismatic schema as well.

Signed-off-by: Ken Barber <ken@bob.sh>
Merge pull request #797 from kbarber/ticket/1.6.x/PDB-299-release_notes_for_rc2

PDB-299 Release notes for 1.6.0-rc2 changes
Merge branch '1.6.x'

* 1.6.x:
  PDB-299 Release notes for 1.6.0-rc2 changes
  PDB-279 Remove extraneous brackets from functions in ->
  PDB-303 Utilise final version of prismatic/schema 0.2.0
  PDB-279 Sanitize report imports
  (PDB-247) Fixes the namespace override warnings from schema

Conflicts:
	project.clj
	src/com/puppetlabs/puppetdb/cli/import.clj