Merge remote-tracking branch 'origin/release/2.2.x'

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