Merge changes I94f90d88,Ieef68c27

* changes:
  spm: update README with list of sample partitions
  cactus: remove reference to PSA from xml test file