Merge the tip of gerrit/master into mosk/master

b3f7931 CEM-30506 CEM-30523 CEM-30511 CEM-30522 Adding new versions for Security vulnerabilities
2d04cba CEM-30506 CEM-30523 CEM-30511 CEM-30522 Adding new versions for Security vulnerabilities
906756b CEM-30506 CEM-30523 CEM-30511 Adding new versions for Security vulnerabilities
b4f638f CEM-30506 CEM-30523 CEM-30511 Adding new versions for Security vulnerabilities

Related-PROD: PRODX-12687

Change-Id: Ic2b966546ad26115e023f3c4cd7d700451be3226