CBQE-0 :: fix vbucket map failures

Change-Id: I5e455088e9cb577e6a98002103763ce50ec59e2d
Reviewed-on: http://review.couchbase.org/39448
Reviewed-by: Thuan Nguyen <soccon@gmail.com>
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>
Reviewed-by: Parag Agarwal <agarwal.parag@gmail.com>
Tested-by: Parag Agarwal <agarwal.parag@gmail.com>