Adjusting upgrade check in admin/cli/upgrade.php (Bug #1394758)

Change-Id: Ic29fccfa3f523a984af60871afe89f7c157b33fa
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Merge "Adjusting upgrade check in admin/cli/upgrade.php (Bug #1394758)"