GUACAMOLE-485: Merge terminal emulator build fix.
GUACAMOLE-485: Merge terminal emulator build fix.

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