Improve logging (again)
Race condition in lock promotion
Don't process incoming RPCs when the Query engine is being stopped
Speed up polling of lock availability