svn merge -c 1586030 from trunk for HADOOP-10473. TestCallQueueManager should interrupt before counting calls.