Bring Hadoop version back down to 1.0.4
Merge branch 'hadoop104' into develop