CBLT-159:  extend TAP_TIMEOUT to 2000

Change-Id: I057aa439400ce6333738a015fb26d7fba7fb15a5