Remove direct dependency on a particular Hadoop version

And a little other catching up with the AMPLab