Upgrade to Spring for Apache Hadoop 2.0.4.RELEASE

Closes #124
Merge branch '1.0.x' into 1.1.x
Merge branch '1.1.x'