MB-9127:  add 2.2.1 builders

Change-Id: Ifdf6641fa2d6fab254c791aa390ed4a2e169933b