Revert "Manual merge of previous commit:"

This reverts commit c7218385f4d378fae0574c43a1fe07e2f285780a.
Revert "Revert "Manual merge of previous commit:""

This reverts commit a8312256ee140d7418297f5dc579ea6078f6a4e5.
Adding SQL update to previous commit

These SQL updates are necessary in order to get table spell_bonus_data
updated for the new structure.