disjoing MR + merge
Merge branch 'master' of https://github.com/ujaved/incubator-spark