PDB-128: Support Oracle Java distribution.

On Debian it's possible to package releases from Oracle through
make-jpkg, a utility provided by the java-package package:
https://wiki.debian.org/JavaPackage

This commit adds support for:
 * Detecting Oracle Java 1.7 packaged RE or SDK
 * Satisfy the package requirement of Java by looking for the j2re1.7
   provides that the make-jpkg packages carry, both RE and SDK.

I've left out satisfying the dependency through j2re1.6 as @kbarber
and I agreed that we shouldn't promote the usage of Java 1.6 any
further.
Fixes an issue when using spyscope as a lein user profile
Merge branch 'maint/1.5.x/spyscope-lein-user-profile-fix' into 1.5.x

* maint/1.5.x/spyscope-lein-user-profile-fix:
  Fixes an issue when using spyscope as a lein user profile
Merge branch '1.5.x' into 1.6.x

* 1.5.x:
  Fixes an issue when using spyscope as a lein user profile

Conflicts:
	project.clj
Merge branch '1.6.x'

* 1.6.x:
  Fixes an issue when using spyscope as a lein user profile
Merge pull request #793 from daenney/debian-java-1.6.x

PDB-128: Support Oracle Java distribution.
Merge branch '1.6.x'

* 1.6.x:
  PDB-128: Support Oracle Java distribution.
(#23422) Use JSON in terminus instead of PSON

The PuppetDB API specifies that it is JSON, so we should parse it as
that and not as PSON.

Some Puppet classes (Puppet::Node and Puppet::Node::Facts) don't support
JSON serialization, so continue to use PSON serialization for them.
In Puppet 3.4.0+ they have methods to do seralization in other formats
than PSON though, so once support for older versions of Puppet is
dropped they can be seralized in JSON as well.
Merge pull request #776 from dalen/json_terminus

(#23422) Use JSON in terminus instead of PSON