Several bugs - changes for RHEL7 and RHEL6

I additionally hit this:

<pre>
type=AVC msg=audit(1407836832.348:680): avc:  denied  { search } for  pid=14485 comm="httpd" name="puppet" dev="vda1" ino=18887 scontext=system_u:system_r:httpd_t:s0 tcontext=system_u:object_r:puppet_etc_t:s0 tclass=dir
</pre>