Upgrading from alpha7 to alpha13 fails

I've narrowed down the issue we are having with this upgrade, but I don't know the best way to fix the issue to successfully upgrade. The errors we are getting are related to "hosting_update_6009" and "hosting_web_server_update_6002". I've attached the log, without debugging/verbose.

What we believe is happening is the hosting_update_6009 function queries the database (SELECT) for some table columns (port, restart_cmd) in hosting_service which do NOT exist, yet. This is done on line 271 in hosting.install:

$server = hosting_context_load('@server_master');

The hosting_web_server_update_6002 function is also querying the database (UPDATE) for unknown columns. This is done on line 62 in hosting_web_server.install:

db_query("UPDATE {hosting_service} SET restart_cmd = '%s', port = 80 WHERE nid=%d AND service='http' AND type = 'apache'", $obj->restart_cmd, $obj->nid);

The reason these columns don't exist yet is because they are part of another upgrade function, hosting_server_update_6003. In the log it looks like hosting_update_6009 runs BEFORE hosting_server_update_6003, which explains why the columns aren't available at that time. However, hosting_web_server_update_6002 appears to run AFTER hosting_server_update_6003, but is still complaining about unknown columns. Help!

I wasn't sure which Aegir component is at fault here, so I'm posting this to the new user mailing list as well as here.

Thanks,
-Tim

P.S. I believe user hozt had the same issue when upgrading to alpha10 here: http://groups.drupal.org/node/86354#comment-270034.