Merge "Implement TIMEOUT_SCALING_FACTOR for tempest"