[SPARK-1685] Cancel retryTimer on restart of Worker or AppClient#602

markhamstra wants to merge 2 commits intoapache:masterapache/spark:masterfrom

markhamstra:SPARK-1685markhamstra/spark:SPARK-1685Copy head branch name to clipboard