Merge "Fix issue with ti-stress not requesting correct capabilities"