Disable the use of -s or --server with gcl upload.

gcl.py

Index: gcl.py
diff --git a/gcl.py b/gcl.py
index ea91fdaf5b1645eceab7152555b156e9e4cb0416..dfe02096d4e5d26766ed019d85ce05923b0a3023 100755
--- a/gcl.py
+++ b/gcl.py
@@ -722,6 +722,8 @@ def CMDupload(change_info, args):
 
   This does not submit a try job; use gcl try to submit a try job.
   """
+  if '-s' in args or '--server' in args:
+    ErrorExit('Don\'t use the -s flag, fix codereview.settings instead')
   if not change_info.GetFiles():
     print "Nothing to upload, changelist is empty."
     return 0