Update to build against Hadoop 2.4