Bind fs.defaultFS to host in order to enable access to hdfs from outside
world
Replace core-site.xml with a template
Merge branch 'hadoop-2.4.1'

Conflicts:
	bootstrap.sh