Think I got past the upgrade.php warnings.
My main.inc.php was pointing to my config.inc.php which was in my root directory and not accessible.
Commented out that line in main.inc.php, which caused it to look in the default location.
Seems ok since I copied main.inc.php to the /includes directory per the upgrade instructions.
Sorry for the false alarm.
