HADOOP-1341. Fix intermittent failure of HBase unit test caused by deadlock. Contributed by Jim Kellerman.