Merge changes Ie33671b0,I1543aa6d into integration

* changes:
  docs(fvp): clarify what `FVP` means
  fix(fvp): allow PSCI 0.2 in the device tree