Check the version number in the committed version.php, not the filesystem

Bug 1215662

Change-Id: Id9b7dbe0b14366cf5b467d83b378131b97d4ec9a
Make sure new upgrade.php sections match with version.php

Bug 1215662

Change-Id: I6887957d91090ca3453b774ad62da4896ff215be