GUACAMOLE-1383: Merge avoid double-encoding client identifiers within URLs.