CBLT-159:  extend TAP_TIMEOUT to 2000

Change-Id: I5d29f9c375a6cf1f282adfdb3c84a474006884d3