CBLT-159:  extend TAP_TIMEOUT to 20000

Change-Id: I0c9a85c317e692f21afa773327bfdf4e0c02bc79