spark update
Merge branch 'och4.0.0' of https://github.com/asiainfo/ochadoop into och4.0.0