Merge 1.1.0 changes to master.

guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java

@@ -20,8 +20,9 @@
 package org.apache.guacamole.form;
 
 /**
- * Represents a time zone field. The field may contain only valid time zone IDs,
- * as dictated by TimeZone.getAvailableIDs().
+ * Represents a time zone field. The field may contain only valid time zone
+ * identifiers, as defined by the IANA time zone database. Such identifiers are
+ * also valid Java time zone IDs as dictated by TimeZone.getAvailableIDs().
  */
 public class TimeZoneField extends Field {
 

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

@@ -108,7 +108,7 @@
                 },
                 {
                     "name"  : "timezone",
-                    "type"  : "TEXT"
+                    "type"  : "TIMEZONE"
                 },
                 {
                     "name"    : "console",

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

@@ -96,7 +96,7 @@
                 },
                 {
                     "name"  : "timezone",
-                    "type"  : "TEXT"
+                    "type"  : "TIMEZONE"
                 },
                 {
                     "name"  : "server-alive-interval",