Merge "Check NPE and log error condition for enableBlockingTimeout in test harness." into tm-qpr-dev