Merge changes Iaa2d833a,Ia0f19785

* changes:
  fix(runtime_services/ffa): dynamically calculate array size
  fix(cactus_tests/ffa): dynamically calculate array size