Note that this also includes correction to URI path encoding to encode spaces in path with percent hex encoding rather than as plus.