Merge "Adjust ETE runner for security tests"