Added custom annotations to logs in query-related functionality in client- and server-side code for PHOENIX-1198

@JamesRTaylor, take a look when you get a chance. Shouldn't be anything controversial. Thanks!
Removed unused variable.