Merge "fix(corstone1000): skip some TF-A tests"