merge 1.1.0 changes back to master.

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json

@@ -215,10 +215,6 @@
                 {
                     "name"  : "static-channels",
                     "type"  : "TEXT"
-                },
-                {
-                    "name"  : "timezone",
-                    "type"  : "TIMEZONE"
                 }
             ]
         },

guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json

@@ -117,10 +117,6 @@
                     "name"    : "terminal-type",
                     "type"    : "ENUM",
                     "options" : [ "", "xterm", "xterm-256color", "vt220", "vt100", "ansi", "linux" ]
-                },
-                {
-                    "name"    : "timezone",
-                    "type"    : "TIMEZONE"
                 }
             ]
         },