Couchbase rebalance timeout fix and a few other comments