Fix more fallout from bug 1001428. r=bustage
Added tag THUNDERBIRD_30_0b1_RELEASE, THUNDERBIRD_30_0b1_BUILD2 for changeset 8ce11aa0cef3