Making sure options exist for _get_cli_params() (Bug 1394754)

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

Change-Id: Ic29fccfa3f523a984af60871afe89f7c157b33fa
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Make sure CLI scripts are only being run from the CLI

Bug 1387903

Change-Id: I369d58f85c944f4be2bc2965c080b2c4c86dadc1
Merge "Making sure options exist for _get_cli_params() (Bug 1394754)" into 1.10_STABLE
Merge changes I369d58f8,Ic29fccfa into 1.10_STABLE

* changes:
  Make sure CLI scripts are only being run from the CLI
  Adjusting upgrade check in admin/cli/upgrade.php (Bug #1394758)