Merge 1.1.0 changes back to master.

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

@@ -106,6 +106,10 @@
                         "tr-tr-qwerty"
                     ]
                 },
+                {
+                    "name"  : "timezone",
+                    "type"  : "TEXT"
+                },
                 {
                     "name"    : "console",
                     "type"    : "BOOLEAN",

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

@@ -94,6 +94,10 @@
                     "name"  : "locale",
                     "type"  : "TEXT"
                 },
+                {
+                    "name"  : "timezone",
+                    "type"  : "TEXT"
+                },
                 {
                     "name"  : "server-alive-interval",
                     "type"  : "NUMERIC"