[puppet/epel7] (21 commits) ...Merge master into epel7

[Sam Kottler]

Summary of changes:

  c32be46... Fixes BZ#1007917: upgrade to 3.3.0 (*)
  0752946... Add tarball, too (*)
  e892b45... Add both new sources (*)
  f035778... Update to 3.3.1 (*)
  38ef600... Add a start wrapper for the agent and master so the master  (*)
  f9345f3... Whoops, add the script to the sources now that it's in the  (*)
  f370982... Make the wrapper a source (*)
  bfd9d58... Ensure the old agent binary gets stopped since the init scr (*)
  a6f2002... Add patch to convert nil resource parameter values to undef (*)
  5559ba0... Update to 3.3.2 (*)
  77ef7b1... Update to 3.4.2 to mitigate CVE-2013-4969 (BZ#1047792) (*)
  a162ea3... Add sources for 3.4.2 (*)
  f127291... Remove F18 conditionals since it's EOL now (*)
  7add85c... Add changelog entry and bump version since scratch-build wa (*)
  f217cd3... Remove repeated Group (*)
  80fdd33... Enable puppet.service during upgrade if puppetagent.service (*)
  dc3f6cc... Use localstatedir macro for upgrade file (*)
  4854041... Bump the release to -4 (*)
  487cbd9... Add rubygem(rgen) runtime reuqirement (*)
  b8e7d98... Bump version for the new requires (*)
  78668ab... Merge master into epel7

(*) This commit already existed in another branch; no separate mail sent