MB-9423: Add a 30 second timeout to cbepctl and cbstats

Change-Id: I392a9efab924de99e9ddbf4171b368b02327453d
Reviewed-on: http://review.couchbase.org/31273
Reviewed-by: abhinav dangeti <abhinav@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>
MB-9852 Notify pending connection when a pending vb becomes active

This change fixes a bug in notifying pending connections
when a vbucket state is transitioned from pending to active.

Change-Id: I5dd77f0f0c8d543808be3613d3d0336b4db01006
Reviewed-on: http://review.couchbase.org/31703
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Chiyoung Seo <chiyoung@couchbase.com>
Merge remote-tracking branch 'couchbase/2.5.0'

* couchbase/2.5.0:
  MB-9852 Notify pending connection when a pending vb becomes active
  MB-9423: Add a 30 second timeout to cbepctl and cbstats

Conflicts:
	src/ep.cc

Change-Id: Id783feda9077f3a9b79d56ab2433531c24755e61