CBD-946: master manifests like 2.1.0

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