[cflsystems]

It is best to patch manually then restoring original files - if you made undocumented changes to them you may not be able to apply this changes again after upgrade. Just run the upgrade - it will show a report first and will not modify any files. If you get anything else than "OK" or "Already patched" do not proceed further. First you need to manually patch files and then you can run the upgrade again