GUACAMOLE-221: Merge ensure guacd always enables broadcast socket keep-alive.
GUACAMOLE-221: Merge ensure guacd always enables broadcast socket keep-alive.


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