There were a few of us that had this issue.  For me, the solution was to delete out the old question type folders and rename the tables so that the upgrade did not then recognize them.  This allowed the upgrade to proceed as normal. Then check for data in the new tables - if it is not there, go ahead and replace them with the old tables (making sure first that the tables have the same structure).  Of course, backup before every step to be safe!!