Main upgrade path fix for the no-upgrade code path and error reporting additions.
Merge pull request #398 from racker/fixes/no-upgrade-path

Main upgrade path fix for the no-upgrade code path and error reporting additions