CBLT-159:  extend TAP_TIMEOUT to 20000

Change-Id: I3f82b2a8ed3ec4a117e226876772089c1fd17963