CBSE-811:  turn off 2.1.1, turn on 2.2.0

Change-Id: I6283a23e83591caddb4bcb76a040fde0841adf9d