Update Puppet to 2.6.18 for various security fixes
    
    BZ#920845
    
    Fixes for CVE-2013-1640 CVE-2013-1652 CVE-2013-1653 CVE-2013-1654
    CVE-2013-1655 CVE-2013-2274 CVE-2013-2275
    
    see puppetlabs.com/security for more information.
    
    This commit also rebases the webrick compatibility patch to be a cherry-pick
    from upstream rather than a Fedora-specific patch.
    
    Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>