Revert 5417 changes to hadoop
Patch by slebresne, reviewed by brandonwilliams for CASSANDRA-7241
Merge branch 'cassandra-2.1' into trunk