MRUNIT-172: Branch trunk should use hadoop 2