Merge "Allow overridding OS_TEST_TIMEOUT via the role variables"