Added test for timeout indicator to allow for negative one
Auto-merge | Integrating changes from apache/master