Reorganize watches in consumer

This is still a work in progress because there are a lot more
watches than we strictly need. However, there was a bug where
changes in /brokers/topics/<topic> weren't triggering a rebalance.
This fix addresses that issue, without requiring a full refactoring
of zookeeper interactions.