In regards to the style directory step in the upgrade instructions, I tend to just delete the "wrappers" file from the style directory in my upgrade package that I roll out to people (since this is really the only thing in there that one would worry about being overwritten anyhow).