Merge "Fix topology description of cpus for DynamIQ based FVP" into integration