CON-1296 | Tweaks for getNoCookieUrl()