Add fixes from upstream svn for a number of issues, most notably that the
        fixconf script had an error in the regexp, which resulted in a prefix
        of 'FcgidFcgid' on the updated directives