CBD-946:  add mappings for 2.1.0 and master builders

Change-Id: I42f73f6a8b673071802384035e4a17bfe5a37ee2