CBSE-881:  2.1.1 not on centos-6 nor ubuntu-1204

Change-Id: I8afe8c84bb26273a71754f9c6f0290a52aa3371f