PYKE-144 / PYKE-668 - improved logging and fixed up URI builder for rs / non-rs and auth / non-auth variations.