Upmerge to master after multinode hadoop fix