Merge "Refactor status_timeout() methods in tempest.test"