Merge "Log request-id even when no HttpServletRequest param or no user-session"