Added custom annotations to query-related log lines, both client- and server-side for PHOENIX-1198