Fix regression in HadoopCompat from CASSANDRA-7579

Patch by jmckenzie; reviewed by bwilliams for CASSANDRA-8292
Merge branch 'cassandra-2.1' into trunk