format changes and simplified logic for timeout case -- fixes BYTEMAN-258
added optional timeout argument to joinWait as for rendezvous -- fixes BYTEMAN-258
correct typos in fix for BYTEMAN-258
added test cases for fix to BYTEMAN-258