Merge branch 'release/2.1.x'

Change-Id: Iebfe99fd05ab5f4cbf49f2ba5ea8a65fd4e9cdcf
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>