Merge changes from topic "spm_ffa_version"

* changes:
  Cactus: FFA Version Test
  SPM: TFTF test of FFA_VERSION interface