Merge changes from topic "od/ffa-id"

* changes:
  cactus: break the message loop on bad message request
  cactus: re-align secure partition id
  cactus: adjust the number of EC context to max number of PEs