The missing mysql.inc.php issue in the upgrader should have been cleared up with the last refresh; could you open the upgrade_changes file and note which instances of mysql.inc.php display? Mine only shows the remove line which is correct (as we've removed it since we've move to mysqli).