CBSE-881:  2.1.1 builders re-activated

Change-Id: Iff7112208e2d3c9e2ce87a81a2f3ff4188493719