Reuse watcher in DistributedQueue across peek/take

Initial patch for SOLR-6336. Some more work can probably be done (other functions in the queue still do this, and probably tests would be good to check this in general), but here's an initial fix which passes tests and fixes Jenkins failures currently happening..