Properly catch timeout exception raised in thread

The Timeout exception raised by eventlet is subclass of
BaseException, not Exception. So we need to catch the former.

Fixes bug: #1263068

Change-Id: I3d63493a2ff99585436aa68e510047d7f4e61345
Merge "Properly catch timeout exception raised in thread"