Make hostname and hostname_method available
Merge remote-tracking branch 'upstream/master'
Adding Solaris 11 support.

  Commit will add the ability to install Diamond from pip on Solaris 11.
  Currently includes start/stop method script plus service manifest,
  both of which should probably go upstream to Diamond.
Use an older solarisstudio

  Solaris Studio 12.4 is not available for all versions of Solaris 11,
  so far I've found 12.2 available on all the revisions we have in
  production.  This commit will roll the module to
  Package[solarisstudio-122].
Can't append to nil class in erb for Puppet 3.7.
Merge branch 'master' of https://github.com/affinitic/garethr-diamond