Add two patches
    1) Ensure that the configuration upgrade script always writes the config
        file with 0600 permissions
    2) Eliminate an infinite loop in group enumerations