Latest changes from asl-usgs (cwbquery timeout)

Fixed timeout exceptions