GUACAMOLE-187: Merge surface resize optimization.
GUACAMOLE-187: Merge surface resize optimization.

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