Hadoop2

I want to merge hadoop2 into amino-cloud:master, not sure if I'm doing this backwards