[sd2_mr0694] Ahn'Kahet and Headless Horseman event guid fixes.
[sd2_mr0695] More work on guids reordering, cleanup and sql-style.