Moved test from using HadoopFS to NFS
Merge branch '4.2'