Merge branch 'master' into yarn

Conflicts:
	bayes/bin/prepare.sh
	bayes/bin/run.sh
	bin/hibench-config.sh
	nutchindexing/bin/prepare.sh
	sort/bin/prepare.sh
	sort/bin/run.sh
	terasort/bin/run.sh
	wordcount/bin/prepare.sh
	wordcount/bin/run.sh