2.2.9 RC Patches

First Final update of 2.2.9 Patches. Fixed many errors in the SMIM
merged records (my bad yo!).

Ready for USKP 2.0.5 update, up to date with kryptopyr's latest update
cycle as well.