Upgrade from 2.2.alpha1 to 2.2.alpha2 fails due to missing option_group

In 2.2.alpha1 the mail_protocol option_group is missing from the database. When you attempt to upgrade to 2.2.alpha2 it fails due to a foreign key constraint violation that looks like this: http://pastebin.com/m9c08c8

It's trying to add option_value's to a group that doesn't exist. It should create the option_group first, then add the values. Kurund says option_group creation may be missing from the upgrade script and asked me to file this issue as a result.