CBQE-928: fix when master is changed onl upgr

Change-Id: Iccd62c719a8a19a40ffd7c05d60b68f8d9c1cc5e
Reviewed-on: http://review.couchbase.org/24220
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>