Merge branch 'release/1.6.x'

Merge the changes required for release v1.6.0 back onto the
master branch.

Change-Id: I4756a9af97b546d3bcde4bbcf87da94963e488f9
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
2 files changed