GUACAMOLE-437: Merge fix extraHeaders scope and StaticHTTPTunnel