ZEN-13793: Timeouts cause retries
Merge pull request #398 from zenoss/feature/ZEN-13793

ZEN-13793: Timeouts cause retries