Updated openstack/openstack
Project: openstack/sahara  c226a782753077bc7709627845c416f764ac9975

Wrap eventlet's Timeout exception

Eventlet's Timeout was subclass of Exception. But at some point it
switched to BaseException. Now statements like

  except Exception as e:

do not catch it. Wrapping Timeout into our own one fixes this.

Change-Id: I90bf3b2335359e1f7f4c376e0e7292f18c75f162