GUACAMOLE-313: Merge ensure keydef structure is freed in all cases.
GUACAMOLE-313: Merge ensure keydef structure is freed in all cases.

apache/guacamole-server,mike-jumper/incubator-guacamole-server,mike-jumper/incubator-guacamole-server,glyptodon/guacamole-server,mike-jumper/incubator-guacamole-server,apache/guacamole-server,mike-jumper/incubator-guacamole-server,apache/guacamole-server,glyptodon/guacamole-server,glyptodon/guacamole-server