TEZ-1684. upgrade mockito to latest release  (Rajesh Balamohan)
(Cherry picked from commit 6bc134837915ebe78ed77f02579a92a7d4d4cb40)
TEZ-1567. Avoid blacklisting nodes when the disable blacklisting
threshold is about to be hit. (sseth)
(cherry picked from commit e530a46c352234459d2aced93e43fcb83c98d450)