Bug 953357 - Check to make sure the server alias is passed as an argument.
Merge pull request #2154 from rmillner/misc_bugs

Merged by openshift-bot