Merge "GerritWatcher: add poll_timeout"