Merge tag 'v2.11' into merge_v2_11

Trusted Firmware-A release v2.11

Change-Id: If5e214b58de6953a7a7c85fdc82609e13b532a31