Hadoop 2

This patch uses hadoop 2 but the hadoop-test from mr1