MB-12048: First step to make the buildbots happy

This is the first step out of two before all changes for MB-12048
are merged.

Change-Id: I318fddb0625219de11ab73b53e6d289f97f60bc9
Reviewed-on: http://review.couchbase.org/40973
Tested-by: Volker Mische <volker.mische@gmail.com>
Reviewed-by: Sriram Melkote <siri@couchbase.com>