svn merge -c 1308925 from trunk. FIXES MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby)