CBD-963:  REVERT previous, now using "master"

Change-Id: Ib3aabcf2da1f246d9effe67c195911667825eb16
Reviewed-on: http://review.couchbase.org/26982
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>