Fix child JVM memory settings.
Merge branch 'master' of github.com:wikimedia/kraken

Conflicts:
	etc/hadoop/conf/mapred-site.xml
okok, one thing at a time.