Brings up to date with commonly tested configuration

Change-Id: Id1791f506e6d822d69ee962a9403a7092afeaaf6
Signed-off-by: Eric Kunze <eric.kunze@arm.com>