added mapred.system.dir
Merge branch 'fix-mr-tmp-dir'

Conflicts:
	manifests/hadoop/defaults.pp