CBD-946:  master manifests like 2.1.0

Change-Id: Idb43b2f75d54eb5e0f3df13a98d7a9058a4e315e