Merge -c 1499566 from branch-1 to branch-1.2 to fix MAPREDUCE-5364. Deadlock between RenewalTimerTask methods cancel() and run(). (kkambatl via tucu)