Merge branch 'release/2.1.x'

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